@@ -38,7 +38,7 @@ echo -e "\033[1m>>>>> Run [elastic/elasticsearch-ruby container] >>>>>>>>>>>>>>>
38
38
39
39
repo=` pwd`
40
40
41
- if [[ $STACK_VERSION == " 8.0.0-SNAPSHOT " ]]; then
41
+ if [[ $STACK_VERSION =~ " ^8\. " ]]; then
42
42
environment=($( cat << -EOF
43
43
--env ELASTIC_CLIENT_APIVERSIONING=true
44
44
--env ELASTIC_PASSWORD=${elastic_password}
51
51
fi
52
52
53
53
# run the client tests
54
- if [[ $STACK_VERSION == " 8.0.0-SNAPSHOT " ]]; then
54
+ if [[ $STACK_VERSION =~ (^8 \. ) ]]; then
55
55
docker run \
56
56
-u " $( id -u) " \
57
57
--network=" ${network_name} " \
@@ -68,33 +68,34 @@ if [[ $STACK_VERSION == "8.0.0-SNAPSHOT" ]]; then
68
68
--rm \
69
69
elastic/elasticsearch-ruby \
70
70
bundle exec rake elasticsearch:download_artifacts test:rest_api
71
- elif [[ $TEST_SUITE != " platinum" ]]; then
72
- docker run \
73
- -u " $( id -u) " \
74
- --network=" ${network_name} " \
75
- --env " TEST_ES_SERVER=${elasticsearch_url} " \
76
- --env " TEST_SUITE=${TEST_SUITE} " \
77
- --env " STACK_VERSION=${STACK_VERSION} " \
78
- --volume $repo :/usr/src/app \
79
- --volume=/tmp:/tmp \
80
- --name elasticsearch-ruby \
81
- --rm \
82
- elastic/elasticsearch-ruby \
83
- bundle exec rake elasticsearch:download_artifacts test:rest_api
84
71
else
85
- docker run \
86
- -u " $( id -u) " \
87
- --network=" ${network_name} " \
88
- --env " TEST_ES_SERVER=${elasticsearch_url} " \
89
- --env " ELASTIC_PASSWORD=${elastic_password} " \
90
- --env " TEST_SUITE=${TEST_SUITE} " \
91
- --env " ELASTIC_USER=elastic" \
92
- --env " SINGLE_TEST=${SINGLE_TEST} " \
93
- --env " STACK_VERSION=${STACK_VERSION} " \
94
- --env " ELASTIC_CLIENT_APIVERSIONING=${ELASTIC_API_VERSIONING:- false} " \
95
- --volume $repo :/usr/src/app \
96
- --name elasticsearch-ruby \
97
- --rm \
98
- elastic/elasticsearch-ruby \
99
- bundle exec rake elasticsearch:download_artifacts test:security
72
+ if [[ $TEST_SUITE != " platinum" ]]; then
73
+ docker run \
74
+ -u " $( id -u) " \
75
+ --network=" ${network_name} " \
76
+ --env " TEST_ES_SERVER=${elasticsearch_url} " \
77
+ --env " TEST_SUITE=${TEST_SUITE} " \
78
+ --env " STACK_VERSION=${STACK_VERSION} " \
79
+ --volume $repo :/usr/src/app \
80
+ --volume=/tmp:/tmp \
81
+ --name elasticsearch-ruby \
82
+ --rm \
83
+ elastic/elasticsearch-ruby \
84
+ bundle exec rake elasticsearch:download_artifacts test:rest_api
85
+ else
86
+ docker run \
87
+ -u " $( id -u) " \
88
+ --network=" ${network_name} " \
89
+ --env " TEST_ES_SERVER=${elasticsearch_url} " \
90
+ --env " ELASTIC_USER=elastic" \
91
+ --env " ELASTIC_PASSWORD=${elastic_password} " \
92
+ --env " TEST_SUITE=${TEST_SUITE} " \
93
+ --env " SINGLE_TEST=${SINGLE_TEST} " \
94
+ --env " STACK_VERSION=${STACK_VERSION} " \
95
+ --volume $repo :/usr/src/app \
96
+ --name elasticsearch-ruby \
97
+ --rm \
98
+ elastic/elasticsearch-ruby \
99
+ bundle exec rake elasticsearch:download_artifacts test:security
100
+ fi
100
101
fi
0 commit comments