Skip to content

Commit f0be60a

Browse files
committed
Move entrypoint for running integration tests inside docker
1 parent 6dc84fa commit f0be60a

File tree

2 files changed

+7
-8
lines changed

2 files changed

+7
-8
lines changed

.buildkite/pull_request_pipeline.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ steps:
140140
command: |
141141
set -euo pipefail
142142
143-
ci/run-integration-tests-fips.sh 0
143+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
144+
docker run test-runner-image ci/run-fips-integration-tests.sh 0
144145
145146
- label: ":lab_coat: Integration Tests - FIPS mode / part 2"
146147
key: "integration-tests-fips-part-2"
@@ -157,7 +158,8 @@ steps:
157158
command: |
158159
set -euo pipefail
159160
160-
ci/run-integration-tests-fips.sh 1
161+
docker build -t test-runner-image -f x-pack/distributions/internal/observabilitySRE/docker/Dockerfile .
162+
docker run test-runner-image ci/run-fips-integration-tests.sh 1
161163
162164
- label: ":lab_coat: Integration Tests / part 1"
163165
key: "integration-tests-part-1"

ci/run-fips-integration-tests.sh

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
# half_number: 0 for first half, 1 for second half
55

66
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-
"
7+
source ci/get-test-half.sh
8+
specs=$(get_test_half "$half_number")
9+
./gradlew --info --stacktrace -PrunTestsInFIPSMode=true runIntegrationTests -PrubyIntegrationSpecs="$specs"

0 commit comments

Comments
 (0)