From 5380a5e6873217f062b4f8b0e7e93cc7b7d993b8 Mon Sep 17 00:00:00 2001 From: Martin Tomazic Date: Wed, 25 Mar 2026 12:35:43 +0100 Subject: [PATCH 1/2] CI: Disable pushing metrics during e2e tests --- .buildkite/benchmarks.pipeline.yml | 27 +++++++++---------- .../scripts/daily_benchmark_analysis.sh | 3 --- .buildkite/scripts/daily_txsource.sh | 2 -- .changelog/6482.trivial.md | 0 4 files changed, 12 insertions(+), 20 deletions(-) create mode 100644 .changelog/6482.trivial.md diff --git a/.buildkite/benchmarks.pipeline.yml b/.buildkite/benchmarks.pipeline.yml index 4b4cfab2e5a..1064b06d3a2 100644 --- a/.buildkite/benchmarks.pipeline.yml +++ b/.buildkite/benchmarks.pipeline.yml @@ -124,9 +124,6 @@ steps: - rm -rf /var/tmp/benchmarks/* - >- .buildkite/scripts/test_e2e.sh - --metrics.address $METRICS_PUSH_ADDR - --metrics.interval 5s - --metrics.labels instance=$BUILDKITE_PIPELINE_NAME-$BUILDKITE_BUILD_NUMBER --num_runs $NUM_RUNS --scenario $SCENARIOS env: @@ -136,16 +133,16 @@ steps: plugins: <<: *docker_plugin - # Wait for all jobs defined before this point - # to finish running in parallel before continuing. - - wait + # # Wait for all jobs defined before this point + # # to finish running in parallel before continuing. + # - wait - ########################### - # Compare benchmark results - ########################### - - label: Benchmark analysis - command: - - .buildkite/scripts/download_e2e_test_artifacts.sh - - .buildkite/scripts/daily_benchmark_analysis.sh - plugins: - <<: *docker_plugin + # ########################### + # # Compare benchmark results + # ########################### + # - label: Benchmark analysis + # command: + # - .buildkite/scripts/download_e2e_test_artifacts.sh + # - .buildkite/scripts/daily_benchmark_analysis.sh + # plugins: + # <<: *docker_plugin diff --git a/.buildkite/scripts/daily_benchmark_analysis.sh b/.buildkite/scripts/daily_benchmark_analysis.sh index 6b9fae56130..37c1b1262c4 100755 --- a/.buildkite/scripts/daily_benchmark_analysis.sh +++ b/.buildkite/scripts/daily_benchmark_analysis.sh @@ -18,9 +18,6 @@ set -ux ./go/oasis-test-runner/oasis-test-runner cmp \ - --metrics.address $METRICS_QUERY_ADDR \ - --metrics.source.git_branch $METRICS_SOURCE_GIT_BRANCH \ - --metrics.target.git_branch $METRICS_TARGET_GIT_BRANCH \ --scenario $SCENARIOS \ --log.level INFO \ --log.format JSON \ diff --git a/.buildkite/scripts/daily_txsource.sh b/.buildkite/scripts/daily_txsource.sh index f0253bedb71..c43670dbcc7 100755 --- a/.buildkite/scripts/daily_txsource.sh +++ b/.buildkite/scripts/daily_txsource.sh @@ -6,8 +6,6 @@ set -euxo pipefail if [[ $BUILDKITE_RETRY_COUNT == 0 ]]; then ./.buildkite/scripts/test_e2e.sh \ - --metrics.address $METRICS_PUSH_ADDR \ - --metrics.labels instance=$BUILDKITE_PIPELINE_NAME-$BUILDKITE_BUILD_NUMBER \ --scenario_timeout 900m \ --scenario e2e/runtime/txsource-multi \ "$@" diff --git a/.changelog/6482.trivial.md b/.changelog/6482.trivial.md new file mode 100644 index 00000000000..e69de29bb2d From 0a5f1f6043edde978e42398ca9e5107f482f9565 Mon Sep 17 00:00:00 2001 From: Martin Tomazic Date: Wed, 25 Mar 2026 14:25:07 +0100 Subject: [PATCH 2/2] .buildkite/benchmarks.pipeline: Increase parallelization This matches the parallelization and timeout of the code.pipeline.yml that also runs all default scenarios. --- .buildkite/benchmarks.pipeline.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.buildkite/benchmarks.pipeline.yml b/.buildkite/benchmarks.pipeline.yml index 1064b06d3a2..9a31ee76c20 100644 --- a/.buildkite/benchmarks.pipeline.yml +++ b/.buildkite/benchmarks.pipeline.yml @@ -117,8 +117,8 @@ steps: # E2E test jobs with enabled benchmarking ######################################### - label: E2E tests - parallelism: 7 - timeout_in_minutes: 30 + parallelism: 30 + timeout_in_minutes: 20 command: - .buildkite/scripts/download_e2e_test_artifacts.sh - rm -rf /var/tmp/benchmarks/*