Updated integration test cleanup (#1438)

.ci/run-elasticsearch.sh

@@ -7,7 +7,7 @@
 # Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
-# Version 1.2.0
+# Version 1.3.0
 # - Initial version of the run-elasticsearch.sh script
 # - Deleting the volume should not dependent on the container still running
 # - Fixed `ES_JAVA_OPTS` config
@@ -15,6 +15,8 @@
 # - Refactored into functions and imports
 # - Support NUMBER_OF_NODES
 # - Added 5 retries on docker pull for fixing transient network errors
+# - Added flags to make local CCR configurations work
+# - Added action.destructive_requires_name=false as the default will be true in v8
 
 script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
@@ -37,6 +39,7 @@ environment=($(cat <<-END
   --env node.attr.testattr=test
   --env path.repo=/tmp
   --env repositories.url.allowed_urls=http://snapshot.test*
+  --env action.destructive_requires_name=false
 END
 ))
 if [[ "$TEST_SUITE" == "platinum" ]]; then
@@ -50,6 +53,7 @@ if [[ "$TEST_SUITE" == "platinum" ]]; then
     --env xpack.security.http.ssl.certificate=certs/testnode.crt
     --env xpack.security.http.ssl.certificate_authorities=certs/ca.crt
     --env xpack.security.transport.ssl.enabled=true
+    --env xpack.security.transport.ssl.verification_mode=certificate
     --env xpack.security.transport.ssl.key=certs/testnode.key
     --env xpack.security.transport.ssl.certificate=certs/testnode.crt
     --env xpack.security.transport.ssl.certificate_authorities=certs/ca.crt
@@ -104,7 +108,7 @@ END
   docker run \
     --name "$node_name" \
     --network "$network_name" \
-    --env "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
+    --env "ES_JAVA_OPTS=-Xms1g -Xmx1g -da:org.elasticsearch.xpack.ccr.index.engine.FollowingEngineAssertions" \
     "${environment[@]}" \
     "${volumes[@]}" \
     --publish "$http_port":9200 \

scripts/es-docker-platinum.sh

@@ -24,6 +24,7 @@ if [ "$1" == "--detach" ]; then
     -e "path.repo=/tmp" \
     -e "repositories.url.allowed_urls=http://snapshot.*" \
     -e "discovery.type=single-node" \
+    -e "action.destructive_requires_name=false" \
     -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
     -e "ELASTIC_PASSWORD=changeme" \
     -e "xpack.security.enabled=true" \
@@ -52,6 +53,7 @@ else
     -e "path.repo=/tmp" \
     -e "repositories.url.allowed_urls=http://snapshot.*" \
     -e "discovery.type=single-node" \
+    -e "action.destructive_requires_name=false" \
     -e "ES_JAVA_OPTS=-Xms1g -Xmx1g" \
     -e "ELASTIC_PASSWORD=changeme" \
     -e "xpack.security.enabled=true" \

scripts/es-docker.sh

@@ -19,6 +19,7 @@ if [ "$1" == "--detach" ]; then
     -e "path.repo=/tmp" \
     -e "repositories.url.allowed_urls=http://snapshot.*" \
     -e "discovery.type=single-node" \
+    -e "action.destructive_requires_name=false" \
     -p 9200:9200 \
     --detach \
     --network=elastic \
@@ -31,6 +32,7 @@ else
     -e "path.repo=/tmp" \
     -e "repositories.url.allowed_urls=http://snapshot.*" \
     -e "discovery.type=single-node" \
+    -e "action.destructive_requires_name=false" \
     -p 9200:9200 \
     --network=elastic \
     --name=elasticsearch \