Skip to content

Commit

Permalink
Updated CI conf
Browse files Browse the repository at this point in the history
  • Loading branch information
delvedor committed Feb 11, 2022
1 parent a42abc8 commit 63d4e13
Show file tree
Hide file tree
Showing 5 changed files with 48 additions and 10 deletions.
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
15 changes: 15 additions & 0 deletions .ci/jobs/elastic+elasticsearch-js+8.0.yml
Original file line number Diff line number Diff line change
@@ -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 * * *'
15 changes: 15 additions & 0 deletions .ci/jobs/elastic+elasticsearch-js+8.1.yml
Original file line number Diff line number Diff line change
@@ -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 * * *'
5 changes: 2 additions & 3 deletions .ci/packer_cache.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
15 changes: 12 additions & 3 deletions .ci/run-elasticsearch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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
Expand All @@ -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=""
Expand Down

0 comments on commit 63d4e13

Please sign in to comment.