Skip to content

Commit 3493a7c

Browse files
committed
Updated .ci/run-elasticsearch to 1.3.0
1 parent 31f4bff commit 3493a7c

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
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 \

.ci/test-matrix.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ PHP_VERSION:
66
- 8.0-cli
77
- 7.4-cli
88
- 7.3-cli
9-
- 7.2-cli
10-
- 7.1-cli
119

1210
TEST_SUITE:
1311
- free

.ci/yaml-tests.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
php util/RestSpecRunner.php
55

66
# Generate the YAML tests for PHPUnit
7-
php util/build_tests.php ${STACK_VERSION} ${TEST_SUITE}
7+
php util/build_tests.php
88

99
# Run YAML tests
1010
vendor/bin/phpunit -c "phpunit-yaml-${TEST_SUITE}-tests.xml"

0 commit comments

Comments
 (0)