Skip to content

Commit 63d4e13

Browse files
committed
Updated CI conf
1 parent a42abc8 commit 63d4e13

File tree

5 files changed

+48
-10
lines changed

5 files changed

+48
-10
lines changed

.ci/jobs/elastic+elasticsearch-js+7.15.yml renamed to .ci/jobs/elastic+elasticsearch-js+7.17.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
---
22
- job:
3-
name: elastic+elasticsearch-js+7.15
4-
display-name: 'elastic / elasticsearch-js # 7.15'
5-
description: Testing the elasticsearch-js 7.15 branch.
3+
name: elastic+elasticsearch-js+7.17
4+
display-name: 'elastic / elasticsearch-js # 7.17'
5+
description: Testing the elasticsearch-js 7.17 branch.
66
junit_results: "*-junit.xml"
77
parameters:
88
- string:
99
name: branch_specifier
10-
default: refs/heads/7.15
10+
default: refs/heads/7.17
1111
description: the Git branch specifier to build (<branchName>, <tagName>,
1212
<commitId>, etc.)
1313
triggers:
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
- job:
3+
name: elastic+elasticsearch-js+8.0
4+
display-name: 'elastic / elasticsearch-js # 8.0'
5+
description: Testing the elasticsearch-js 8.0 branch.
6+
junit_results: "*-junit.xml"
7+
parameters:
8+
- string:
9+
name: branch_specifier
10+
default: refs/heads/8.0
11+
description: the Git branch specifier to build (<branchName>, <tagName>,
12+
<commitId>, etc.)
13+
triggers:
14+
- github
15+
- timed: 'H */12 * * *'
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
- job:
3+
name: elastic+elasticsearch-js+8.1
4+
display-name: 'elastic / elasticsearch-js # 8.1'
5+
description: Testing the elasticsearch-js 8.1 branch.
6+
junit_results: "*-junit.xml"
7+
parameters:
8+
- string:
9+
name: branch_specifier
10+
default: refs/heads/8.1
11+
description: the Git branch specifier to build (<branchName>, <tagName>,
12+
<commitId>, etc.)
13+
triggers:
14+
- github
15+
- timed: 'H */12 * * *'

.ci/packer_cache.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22

33
source /usr/local/bin/bash_standard_lib.sh
44

5-
DOCKER_IMAGES="node:14-alpine
5+
DOCKER_IMAGES="node:16-alpine
6+
node:14-alpine
67
node:12-alpine
7-
node:10-alpine
8-
node:8-alpine
98
"
109

1110
for di in ${DOCKER_IMAGES}

.ci/run-elasticsearch.sh

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
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.5.0
10+
# Version 1.6.1
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
@@ -18,7 +18,9 @@
1818
# - Added flags to make local CCR configurations work
1919
# - Added action.destructive_requires_name=false as the default will be true in v8
2020
# - Added ingest.geoip.downloader.enabled=false as it causes false positives in testing
21-
# - Moved ELASTIC_PASSWORD to the base arguments for "Security On by default"
21+
# - Moved ELASTIC_PASSWORD and xpack.security.enabled to the base arguments for "Security On by default"
22+
# - Use https only when TEST_SUITE is "platinum", when "free" use http
23+
# - Set xpack.security.enabled=false for "free" and xpack.security.enabled=true for "platinum"
2224

2325
script_path=$(dirname $(realpath -s $0))
2426
source $script_path/functions/imports.sh
@@ -44,12 +46,13 @@ environment=($(cat <<-END
4446
--env repositories.url.allowed_urls=http://snapshot.test*
4547
--env action.destructive_requires_name=false
4648
--env ingest.geoip.downloader.enabled=false
49+
--env cluster.deprecation_indexing.enabled=false
4750
END
4851
))
4952
if [[ "$TEST_SUITE" == "platinum" ]]; then
5053
environment+=($(cat <<-END
51-
--env xpack.license.self_generated.type=trial
5254
--env xpack.security.enabled=true
55+
--env xpack.license.self_generated.type=trial
5356
--env xpack.security.http.ssl.enabled=true
5457
--env xpack.security.http.ssl.verification_mode=certificate
5558
--env xpack.security.http.ssl.key=certs/testnode.key
@@ -68,6 +71,12 @@ END
6871
--volume $ssl_ca:/usr/share/elasticsearch/config/certs/ca.crt
6972
END
7073
))
74+
else
75+
environment+=($(cat <<-END
76+
--env xpack.security.enabled=false
77+
--env xpack.security.http.ssl.enabled=false
78+
END
79+
))
7180
fi
7281

7382
cert_validation_flags=""

0 commit comments

Comments
 (0)