From 63d4e139b3ae17c2e43f81c9ab82fb359a0439b1 Mon Sep 17 00:00:00 2001 From: delvedor Date: Fri, 11 Feb 2022 11:17:33 +0100 Subject: [PATCH] Updated CI conf --- ...7.15.yml => elastic+elasticsearch-js+7.17.yml} | 8 ++++---- .ci/jobs/elastic+elasticsearch-js+8.0.yml | 15 +++++++++++++++ .ci/jobs/elastic+elasticsearch-js+8.1.yml | 15 +++++++++++++++ .ci/packer_cache.sh | 5 ++--- .ci/run-elasticsearch.sh | 15 ++++++++++++--- 5 files changed, 48 insertions(+), 10 deletions(-) rename .ci/jobs/{elastic+elasticsearch-js+7.15.yml => elastic+elasticsearch-js+7.17.yml} (60%) create mode 100644 .ci/jobs/elastic+elasticsearch-js+8.0.yml create mode 100644 .ci/jobs/elastic+elasticsearch-js+8.1.yml diff --git a/.ci/jobs/elastic+elasticsearch-js+7.15.yml b/.ci/jobs/elastic+elasticsearch-js+7.17.yml similarity index 60% rename from .ci/jobs/elastic+elasticsearch-js+7.15.yml rename to .ci/jobs/elastic+elasticsearch-js+7.17.yml index e37c37998..3e167ef70 100644 --- a/.ci/jobs/elastic+elasticsearch-js+7.15.yml +++ b/.ci/jobs/elastic+elasticsearch-js+7.17.yml @@ -1,13 +1,13 @@ --- - job: - name: elastic+elasticsearch-js+7.15 - display-name: 'elastic / elasticsearch-js # 7.15' - description: Testing the elasticsearch-js 7.15 branch. + name: elastic+elasticsearch-js+7.17 + display-name: 'elastic / elasticsearch-js # 7.17' + description: Testing the elasticsearch-js 7.17 branch. junit_results: "*-junit.xml" parameters: - string: name: branch_specifier - default: refs/heads/7.15 + default: refs/heads/7.17 description: the Git branch specifier to build (<branchName>, <tagName>, <commitId>, etc.) triggers: diff --git a/.ci/jobs/elastic+elasticsearch-js+8.0.yml b/.ci/jobs/elastic+elasticsearch-js+8.0.yml new file mode 100644 index 000000000..7c8f25244 --- /dev/null +++ b/.ci/jobs/elastic+elasticsearch-js+8.0.yml @@ -0,0 +1,15 @@ +--- +- job: + name: elastic+elasticsearch-js+8.0 + display-name: 'elastic / elasticsearch-js # 8.0' + description: Testing the elasticsearch-js 8.0 branch. + junit_results: "*-junit.xml" + parameters: + - string: + name: branch_specifier + default: refs/heads/8.0 + description: the Git branch specifier to build (<branchName>, <tagName>, + <commitId>, etc.) + triggers: + - github + - timed: 'H */12 * * *' diff --git a/.ci/jobs/elastic+elasticsearch-js+8.1.yml b/.ci/jobs/elastic+elasticsearch-js+8.1.yml new file mode 100644 index 000000000..61e86ad5a --- /dev/null +++ b/.ci/jobs/elastic+elasticsearch-js+8.1.yml @@ -0,0 +1,15 @@ +--- +- job: + name: elastic+elasticsearch-js+8.1 + display-name: 'elastic / elasticsearch-js # 8.1' + description: Testing the elasticsearch-js 8.1 branch. + junit_results: "*-junit.xml" + parameters: + - string: + name: branch_specifier + default: refs/heads/8.1 + description: the Git branch specifier to build (<branchName>, <tagName>, + <commitId>, etc.) + triggers: + - github + - timed: 'H */12 * * *' diff --git a/.ci/packer_cache.sh b/.ci/packer_cache.sh index 41f3c12db..97903810d 100644 --- a/.ci/packer_cache.sh +++ b/.ci/packer_cache.sh @@ -2,10 +2,9 @@ source /usr/local/bin/bash_standard_lib.sh -DOCKER_IMAGES="node:14-alpine +DOCKER_IMAGES="node:16-alpine +node:14-alpine node:12-alpine -node:10-alpine -node:8-alpine " for di in ${DOCKER_IMAGES} diff --git a/.ci/run-elasticsearch.sh b/.ci/run-elasticsearch.sh index 89bce8cbd..3f4e2f1da 100755 --- a/.ci/run-elasticsearch.sh +++ b/.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.5.0 +# Version 1.6.1 # - Initial version of the run-elasticsearch.sh script # - Deleting the volume should not dependent on the container still running # - Fixed `ES_JAVA_OPTS` config @@ -18,7 +18,9 @@ # - Added flags to make local CCR configurations work # - Added action.destructive_requires_name=false as the default will be true in v8 # - Added ingest.geoip.downloader.enabled=false as it causes false positives in testing -# - Moved ELASTIC_PASSWORD to the base arguments for "Security On by default" +# - Moved ELASTIC_PASSWORD and xpack.security.enabled to the base arguments for "Security On by default" +# - Use https only when TEST_SUITE is "platinum", when "free" use http +# - Set xpack.security.enabled=false for "free" and xpack.security.enabled=true for "platinum" script_path=$(dirname $(realpath -s $0)) source $script_path/functions/imports.sh @@ -44,12 +46,13 @@ environment=($(cat <<-END --env repositories.url.allowed_urls=http://snapshot.test* --env action.destructive_requires_name=false --env ingest.geoip.downloader.enabled=false + --env cluster.deprecation_indexing.enabled=false END )) if [[ "$TEST_SUITE" == "platinum" ]]; then environment+=($(cat <<-END - --env xpack.license.self_generated.type=trial --env xpack.security.enabled=true + --env xpack.license.self_generated.type=trial --env xpack.security.http.ssl.enabled=true --env xpack.security.http.ssl.verification_mode=certificate --env xpack.security.http.ssl.key=certs/testnode.key @@ -68,6 +71,12 @@ END --volume $ssl_ca:/usr/share/elasticsearch/config/certs/ca.crt END )) +else + environment+=($(cat <<-END + --env xpack.security.enabled=false + --env xpack.security.http.ssl.enabled=false +END +)) fi cert_validation_flags=""