oasisprotocol
diff --git a/.buildkite/benchmarks.pipeline.yml b/.buildkite/benchmarks.pipeline.yml
@@ -29,7 +29,7 @@ docker_plugin_default_config: &docker_plugin_default_config
     - "BUILDKITE_PIPELINE_NAME"
     - "BUILDKITE_BUILD_NUMBER"
     - "BUILDKITE_BUILD_URL"
-    - "TESTS"
+    - "SCENARIOS"
     - "NUM_RUNS"
     - "SLACK_WEBHOOK_URL"
     - "METRICS_PUSH_ADDR"
@@ -123,7 +123,13 @@ steps:
     command:
       - .buildkite/scripts/download_e2e_test_artifacts.sh
       - 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 -t $TESTS
+      - >-
+          .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:
       TEST_BASE_DIR: /var/tmp/benchmarks
     agents:

diff --git a/.buildkite/code.pipeline.yml b/.buildkite/code.pipeline.yml
@@ -244,8 +244,8 @@ steps:
     timeout_in_minutes: 21
     command:
       - .buildkite/scripts/download_e2e_test_artifacts.sh
-      # Only run runtime tests as others do not use SGX.
-      - .buildkite/scripts/test_e2e.sh -t e2e/runtime/.*
+      # Only run runtime scenarios as others do not use SGX.
+      - .buildkite/scripts/test_e2e.sh --scenario e2e/runtime/.*
     artifact_paths:
       - coverage-merged-e2e-*.txt
       - /tmp/e2e/**/*.log

diff --git a/.buildkite/longtests.pipeline.yml b/.buildkite/longtests.pipeline.yml
@@ -27,6 +27,9 @@ docker_plugin_default_config: &docker_plugin_default_config
     - "CARGO_INSTALL_ROOT=/root/.cargo"
     - "GOPROXY=https://proxy.golang.org/"
     - "SLACK_WEBHOOK_URL"
+    - "METRICS_PUSH_ADDR"
+    - "BUILDKITE_PIPELINE_NAME"
+    - "BUILDKITE_BUILD_NUMBER"
   propagate-environment: true
   unconfined: true
 

diff --git a/.buildkite/scripts/daily_benchmark_analysis.sh b/.buildkite/scripts/daily_benchmark_analysis.sh
@@ -12,7 +12,7 @@
 # METRICS_SOURCE_GIT_BRANCH - name of feature branch on git (e.g. jsmith/feature/abc)
 # METRICS_TARGET_GIT_BRANCH - name of master branch on git (e.g. master)
 # METRICS_THRESHOLDS - max or min thresholds flags (e.g. --max_threshold.cpu.avg_ratio 1.05)
-# TESTS - names of test(s) to compare (e.g. e2e/runtime/runtime)
+# SCENARIOS - names of scenario(s) to compare (e.g. e2e/runtime/runtime)
 # SLACK_WEBHOOK_URL - slack webhook for reporting (e.g. https://hooks.slack.com/services/xxxxxx)
 
 set -ux
@@ -21,7 +21,7 @@ set -ux
   --metrics.address $METRICS_QUERY_ADDR \
   --metrics.source.git_branch $METRICS_SOURCE_GIT_BRANCH \
   --metrics.target.git_branch $METRICS_TARGET_GIT_BRANCH \
-  -t $TESTS \
+  --scenario $SCENARIOS \
   --log.level INFO \
   --log.format JSON \
   $METRICS_THRESHOLDS \

diff --git a/.buildkite/scripts/daily_txsource.sh b/.buildkite/scripts/daily_txsource.sh
@@ -6,7 +6,10 @@ set -euxo pipefail
 
 if [[ $BUILDKITE_RETRY_COUNT == 0 ]]; then
     rm -rf /var/tmp/longtests/*
-    ./.buildkite/scripts/test_e2e.sh -t e2e/runtime/txsource-multi
+    ./.buildkite/scripts/test_e2e.sh \
+        --metrics.address $METRICS_PUSH_ADDR \
+        --metrics.labels instance=$BUILDKITE_PIPELINE_NAME-$BUILDKITE_BUILD_NUMBER \
+        --scenario e2e/runtime/txsource-multi
 else
     curl -H "Content-Type: application/json" \
         -X POST \

diff --git a/.buildkite/scripts/sgx_ias_tests.sh b/.buildkite/scripts/sgx_ias_tests.sh
@@ -21,4 +21,4 @@ export OASIS_UNSAFE_KM_POLICY_KEYS=1
 export OASIS_UNSAFE_ALLOW_DEBUG_ENCLAVES=1
 
 make all
-.buildkite/scripts/test_e2e.sh -t e2e/runtime/runtime-encryption
+.buildkite/scripts/test_e2e.sh --scenario e2e/runtime/runtime-encryption
diff --git a/.changelog/3090.internal.md b/.changelog/3090.internal.md
@@ -0,0 +1 @@
+ci/longtests: Setup prometheus monitoring
diff --git a/.changelog/3106.internal.md b/.changelog/3106.internal.md
@@ -0,0 +1 @@
+go/tests/e2e: Add missing Clone() override to late-start
diff --git a/go/oasis-test-runner/scenario/e2e/runtime/late_start.go b/go/oasis-test-runner/scenario/e2e/runtime/late_start.go
@@ -23,6 +23,12 @@ func newLateStartImpl(name, clientBinary string, clientArgs []string) scenario.S
 	}
 }
 
+func (sc *lateStartImpl) Clone() scenario.Scenario {
+	return &lateStartImpl{
+		runtimeImpl: *sc.runtimeImpl.Clone().(*runtimeImpl),
+	}
+}
+
 func (sc *lateStartImpl) Fixture() (*oasis.NetworkFixture, error) {
 	f, err := sc.runtimeImpl.Fixture()
 	if err != nil {
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		go/tests/e2e: Add missing Clone() override to late-start