Merge branch 'main' into threadmxbean

prometheus · Dec 18, 2024 · 01d1cb1 · 01d1cb1
2 parents b52fff7 + efd138d
commit 01d1cb1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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