Skip to content

Commit 052e138

Browse files
authored
Updated integration test cleanup (#1438)
1 parent 226d0e3 commit 052e138

File tree

3 files changed

+10
-2
lines changed

3 files changed

+10
-2
lines changed

.ci/run-elasticsearch.sh

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,16 @@
77
# Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
88
# Export the NUMBER_OF_NODES variable to start more than 1 node
99

10-
# Version 1.2.0
10+
# Version 1.3.0
1111
# - Initial version of the run-elasticsearch.sh script
1212
# - Deleting the volume should not dependent on the container still running
1313
# - Fixed `ES_JAVA_OPTS` config
1414
# - Moved to STACK_VERSION and TEST_VERSION
1515
# - Refactored into functions and imports
1616
# - Support NUMBER_OF_NODES
1717
# - Added 5 retries on docker pull for fixing transient network errors
18+
# - Added flags to make local CCR configurations work
19+
# - Added action.destructive_requires_name=false as the default will be true in v8
1820

1921
script_path=$(dirname $(realpath -s $0))
2022
source $script_path/functions/imports.sh
@@ -37,6 +39,7 @@ environment=($(cat <<-END
3739
--env node.attr.testattr=test
3840
--env path.repo=/tmp
3941
--env repositories.url.allowed_urls=http://snapshot.test*
42+
--env action.destructive_requires_name=false
4043
END
4144
))
4245
if [[ "$TEST_SUITE" == "platinum" ]]; then
@@ -50,6 +53,7 @@ if [[ "$TEST_SUITE" == "platinum" ]]; then
5053
--env xpack.security.http.ssl.certificate=certs/testnode.crt
5154
--env xpack.security.http.ssl.certificate_authorities=certs/ca.crt
5255
--env xpack.security.transport.ssl.enabled=true
56+
--env xpack.security.transport.ssl.verification_mode=certificate
5357
--env xpack.security.transport.ssl.key=certs/testnode.key
5458
--env xpack.security.transport.ssl.certificate=certs/testnode.crt
5559
--env xpack.security.transport.ssl.certificate_authorities=certs/ca.crt
@@ -104,7 +108,7 @@ END
104108
docker run \
105109
--name "$node_name" \
106110
--network "$network_name" \
107-
--env "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
111+
--env "ES_JAVA_OPTS=-Xms1g -Xmx1g -da:org.elasticsearch.xpack.ccr.index.engine.FollowingEngineAssertions" \
108112
"${environment[@]}" \
109113
"${volumes[@]}" \
110114
--publish "$http_port":9200 \

scripts/es-docker-platinum.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ if [ "$1" == "--detach" ]; then
2424
-e "path.repo=/tmp" \
2525
-e "repositories.url.allowed_urls=http://snapshot.*" \
2626
-e "discovery.type=single-node" \
27+
-e "action.destructive_requires_name=false" \
2728
-e "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
2829
-e "ELASTIC_PASSWORD=changeme" \
2930
-e "xpack.security.enabled=true" \
@@ -52,6 +53,7 @@ else
5253
-e "path.repo=/tmp" \
5354
-e "repositories.url.allowed_urls=http://snapshot.*" \
5455
-e "discovery.type=single-node" \
56+
-e "action.destructive_requires_name=false" \
5557
-e "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
5658
-e "ELASTIC_PASSWORD=changeme" \
5759
-e "xpack.security.enabled=true" \

scripts/es-docker.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ if [ "$1" == "--detach" ]; then
1919
-e "path.repo=/tmp" \
2020
-e "repositories.url.allowed_urls=http://snapshot.*" \
2121
-e "discovery.type=single-node" \
22+
-e "action.destructive_requires_name=false" \
2223
-p 9200:9200 \
2324
--detach \
2425
--network=elastic \
@@ -31,6 +32,7 @@ else
3132
-e "path.repo=/tmp" \
3233
-e "repositories.url.allowed_urls=http://snapshot.*" \
3334
-e "discovery.type=single-node" \
35+
-e "action.destructive_requires_name=false" \
3436
-p 9200:9200 \
3537
--network=elastic \
3638
--name=elasticsearch \

0 commit comments

Comments
 (0)