Skip to content

Commit 6dc84fa

Browse files
committed
Wrap integration tests in shell script to avoid BK interpolation
1 parent 55435bf commit 6dc84fa

File tree

2 files changed

+14
-12
lines changed

2 files changed

+14
-12
lines changed

.buildkite/pull_request_pipeline.yml

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,12 +140,7 @@ steps:
140140
command: |
141141
set -euo pipefail
142142
143-
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
144-
docker run test-runner-image /bin/bash -c '
145-
source ci/get-test-half.sh
146-
specs=\$(get_test_half 0)
147-
./gradlew --info --stacktrace -PrunTestsInFIPSMode=true runIntegrationTests -PrubyIntegrationSpecs="$specs"
148-
'
143+
ci/run-integration-tests-fips.sh 0
149144
150145
- label: ":lab_coat: Integration Tests - FIPS mode / part 2"
151146
key: "integration-tests-fips-part-2"
@@ -162,12 +157,7 @@ steps:
162157
command: |
163158
set -euo pipefail
164159
165-
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
166-
docker run test-runner-image /bin/bash -c '
167-
source ci/get-test-half.sh
168-
specs=\$(get_test_half 1)
169-
./gradlew --info --stacktrace -PrunTestsInFIPSMode=true runIntegrationTests -PrubyIntegrationSpecs="$specs"
170-
'
160+
ci/run-integration-tests-fips.sh 1
171161
172162
- label: ":lab_coat: Integration Tests / part 1"
173163
key: "integration-tests-part-1"

ci/run-fips-integration-tests.sh

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
#!/bin/bash
2+
# get_test_half returns either the first or second half of integration tests
3+
# Usage: get_test_half <half_number>
4+
# half_number: 0 for first half, 1 for second half
5+
6+
half_number=$1
7+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
8+
docker run test-runner-image /bin/bash -c "
9+
source ci/get-test-half.sh
10+
specs=$(get_test_half $half_number)
11+
./gradlew --info --stacktrace -PrunTestsInFIPSMode=true runIntegrationTests -PrubyIntegrationSpecs=\"\$specs\"
12+
"

0 commit comments

Comments
 (0)