Skip to content

Commit 1159fe8

Browse files
committed
[CI] Refactors run-repository
1 parent 90af065 commit 1159fe8

File tree

1 file changed

+28
-13
lines changed

1 file changed

+28
-13
lines changed

.ci/run-repository.sh

Lines changed: 28 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ repo=`pwd`
4040

4141
if [[ $STACK_VERSION == "8.0.0-SNAPSHOT" ]]; then
4242
environment=($(cat <<-EOF
43-
--env ELASTIC_API_VERSIONING=true
43+
--env ELASTIC_CLIENT_APIVERSIONING=true
4444
--env ELASTIC_PASSWORD=${elastic_password}
4545
--env ELASTIC_USER=elastic
4646
--env QUIET=false
@@ -51,18 +51,33 @@ EOF
5151
fi
5252

5353
# run the client tests
54-
if [[ $TEST_SUITE != "platinum" ]]; then
55-
docker run \
56-
--network="${network_name}" \
57-
--env "TEST_ES_SERVER=${elasticsearch_url}" \
58-
--env "TEST_SUITE=${TEST_SUITE}" \
59-
"${environment[@]:-}" \
60-
--volume $repo:/usr/src/app \
61-
--volume=/tmp:/tmp \
62-
--name elasticsearch-ruby \
63-
--rm \
64-
elastic/elasticsearch-ruby \
65-
bundle exec rake elasticsearch:download_artifacts test:rest_api
54+
if [[ $STACK_VERSION == "8.0.0-SNAPSHOT" ]]; then
55+
docker run \
56+
--network="${network_name}" \
57+
--env "ELASTIC_CLIENT_APIVERSIONING=true" \
58+
--env "ELASTIC_PASSWORD=${elastic_password}" \
59+
--env "ELASTIC_USER=elastic" \
60+
--env "QUIET=false" \
61+
--env "STACK_VERSION=${STACK_VERSION}" \
62+
--env "TEST_ES_SERVER=${elasticsearch_url}" \
63+
--env "TEST_SUITE=${TEST_SUITE}" \
64+
--volume $repo:/usr/src/app \
65+
--volume=/tmp:/tmp \
66+
--name elasticsearch-ruby \
67+
--rm \
68+
elastic/elasticsearch-ruby \
69+
bundle exec rake elasticsearch:download_artifacts test:rest_api
70+
elif [[ $TEST_SUITE != "platinum" ]]; then
71+
docker run \
72+
--network="${network_name}" \
73+
--env "TEST_ES_SERVER=${elasticsearch_url}" \
74+
--env "TEST_SUITE=${TEST_SUITE}" \
75+
--volume $repo:/usr/src/app \
76+
--volume=/tmp:/tmp \
77+
--name elasticsearch-ruby \
78+
--rm \
79+
elastic/elasticsearch-ruby \
80+
bundle exec rake elasticsearch:download_artifacts test:rest_api
6681
else
6782
docker run \
6883
--network="${network_name}" \

0 commit comments

Comments
 (0)