From efd138d429d3cefa956f7c76ec40ed09e4ae58eb Mon Sep 17 00:00:00 2001 From: Gregor Zeitlinger Date: Wed, 18 Dec 2024 12:57:04 +0100 Subject: [PATCH] update oats (#1236) Signed-off-by: Gregor Zeitlinger --- .github/workflows/acceptance-tests.yml | 2 +- .../example-exporter-opentelemetry/oats-tests/agent/oats.yaml | 1 - .../example-exporter-opentelemetry/oats-tests/http/oats.yaml | 1 - scripts/run-acceptance-tests.sh | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/acceptance-tests.yml b/.github/workflows/acceptance-tests.yml index e6a64579e..857bc5b01 100644 --- a/.github/workflows/acceptance-tests.yml +++ b/.github/workflows/acceptance-tests.yml @@ -15,7 +15,7 @@ jobs: uses: actions/checkout@v4 with: repository: grafana/oats - ref: 7cd5ca42fff009fd67ea986d42c79134ac99ae48 + ref: v0.1.0 path: oats - name: Set up JDK uses: actions/setup-java@v4 diff --git a/examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml b/examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml index 08e4d8d3f..acd85ab11 100644 --- a/examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml +++ b/examples/example-exporter-opentelemetry/oats-tests/agent/oats.yaml @@ -1,6 +1,5 @@ # OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml docker-compose: - generator: docker-lgtm files: - ./docker-compose.yml expected: diff --git a/examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml b/examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml index a3af9ffc2..accca127d 100644 --- a/examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml +++ b/examples/example-exporter-opentelemetry/oats-tests/http/oats.yaml @@ -1,6 +1,5 @@ # OATS is an acceptance testing framework for OpenTelemetry - https://github.com/grafana/oats/tree/main/yaml docker-compose: - generator: docker-lgtm files: - ./docker-compose.yml expected: diff --git a/scripts/run-acceptance-tests.sh b/scripts/run-acceptance-tests.sh index 151783f77..f72b98573 100755 --- a/scripts/run-acceptance-tests.sh +++ b/scripts/run-acceptance-tests.sh @@ -4,7 +4,6 @@ set -euo pipefail cd oats/yaml go install github.com/onsi/ginkgo/v2/ginkgo -export TESTCASE_SKIP_BUILD=true export TESTCASE_TIMEOUT=5m export TESTCASE_BASE_PATH=../../examples -ginkgo -r # is parallel causing problems? -p +ginkgo