From d047509d2475b8484dd42cfa9d05aa665d575817 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Apr 2025 18:33:47 +0200 Subject: [PATCH 1/3] update oats --- .github/scripts/run-oats-tests.sh | 7 ++----- .github/workflows/oats-tests.yml | 12 ++---------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/.github/scripts/run-oats-tests.sh b/.github/scripts/run-oats-tests.sh index eaa24a2fc..8375c4e5b 100755 --- a/.github/scripts/run-oats-tests.sh +++ b/.github/scripts/run-oats-tests.sh @@ -8,8 +8,5 @@ popd wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash -cd oats/yaml -go install github.com/onsi/ginkgo/v2/ginkgo@latest -export TESTCASE_TIMEOUT=5m -export TESTCASE_BASE_PATH=../.. -ginkgo -r --github-output +go install https://github.com/grafana/oats@0.2.0 +oats -timeout 5m -lgtm-version logging-k8s-stdout-otlp-json/ diff --git a/.github/workflows/oats-tests.yml b/.github/workflows/oats-tests.yml index 995051fcb..466a6170f 100644 --- a/.github/workflows/oats-tests.yml +++ b/.github/workflows/oats-tests.yml @@ -27,18 +27,10 @@ jobs: with: cache-read-only: ${{ github.event_name == 'pull_request' }} - - name: Check out oats - uses: actions/checkout@v4 - with: - repository: grafana/oats - ref: v0.1.0 - path: oats - - name: Set up Go uses: actions/setup-go@v5 with: go-version: '1.24' - cache-dependency-path: oats/go.sum - name: Run acceptance tests run: .github/scripts/run-oats-tests.sh @@ -47,5 +39,5 @@ jobs: uses: actions/upload-artifact@v4 if: failure() with: - name: OATS logs - path: oats/yaml/build/**/*.log + name: OATs logs + path: build/**/*.log From 21cb7e79fc226faceb7870e2fc107b7fe81ecc7b Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Apr 2025 18:40:31 +0200 Subject: [PATCH 2/3] update oats --- .github/scripts/run-oats-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/run-oats-tests.sh b/.github/scripts/run-oats-tests.sh index 8375c4e5b..b7f19f4a9 100755 --- a/.github/scripts/run-oats-tests.sh +++ b/.github/scripts/run-oats-tests.sh @@ -8,5 +8,5 @@ popd wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash -go install https://github.com/grafana/oats@0.2.0 +go install github.com/grafana/oats@v0.2.0 oats -timeout 5m -lgtm-version logging-k8s-stdout-otlp-json/ From e5b4ab9441387c50f4bc04a5860ef5fdf8488c82 Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Fri, 4 Apr 2025 18:43:12 +0200 Subject: [PATCH 3/3] update oats --- .github/scripts/run-oats-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/scripts/run-oats-tests.sh b/.github/scripts/run-oats-tests.sh index b7f19f4a9..7775fb7c5 100755 --- a/.github/scripts/run-oats-tests.sh +++ b/.github/scripts/run-oats-tests.sh @@ -9,4 +9,4 @@ popd wget -q -O - https://raw.githubusercontent.com/k3d-io/k3d/main/install.sh | bash go install github.com/grafana/oats@v0.2.0 -oats -timeout 5m -lgtm-version logging-k8s-stdout-otlp-json/ +oats -timeout 5m logging-k8s-stdout-otlp-json/