Skip to content

Commit c799368

Browse files
tlrxtlrx
committed
Merge branch 'master' into delete-snap-on-searchable-index-deletion
2 parents 4e641ab + d238374 commit c799368

File tree

3,050 files changed

+98233
-53122
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

3,050 files changed

+98233
-53122
lines changed

‎.backportrc.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"targetBranchChoices": [
44
{ "name": "master", "checked": true },
55
{ "name": "7.x", "checked": true },
6+
"7.15",
67
"7.14",
7-
"7.13",
88
"6.8"
99
],
1010
"targetPRLabels": ["backport"],
1111
"branchLabelMapping": {
1212
"^v8.0.0$": "master",
13-
"^v7.15.0$": "7.x",
13+
"^v7.16.0$": "7.x",
1414
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
1515
}
1616
}

‎.ci/bwcVersions

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,9 @@ BWC_VERSION:
3838
- "7.13.2"
3939
- "7.13.3"
4040
- "7.13.4"
41-
- "7.13.5"
4241
- "7.14.0"
42+
- "7.14.1"
43+
- "7.14.2"
4344
- "7.15.0"
45+
- "7.16.0"
4446
- "8.0.0"

‎.ci/jobs.t/defaults.yml

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,11 @@
5858
GRADLEW=./gradlew --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/
5959
GRADLEW_BAT=./gradlew.bat --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/
6060
publishers:
61-
- junit:
62-
results: "**/*Junit/*.xml, **/test-results/*/*.xml"
63-
keep-long-stdio: true
64-
allow-empty-results: true
61+
# Disable Junit publisher for now since it's causing OOME on our Jenkins instance
62+
# - junit:
63+
# results: "**/*Junit/*.xml, **/test-results/*/*.xml"
64+
# keep-long-stdio: true
65+
# allow-empty-results: true
6566
# Upload additional logs
6667
- google-cloud-storage:
6768
credentials-id: 'elasticsearch-ci-gcs-plugin'

‎.ci/jobs.t/elastic+elasticsearch+multijob+packaging-tests-unix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
- centos-8-packaging
1818
- debian-9-packaging
1919
- debian-10-packaging
20+
- debian-11-packaging
2021
- opensuse-15-1-packaging
2122
- oraclelinux-7-packaging
2223
- oraclelinux-8-packaging

‎.ci/jobs.t/elastic+elasticsearch+multijob+platform-support-unix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
- "centos-8&&immutable"
1818
- "debian-9&&immutable"
1919
- "debian-10&&immutable"
20+
- "debian-11&&immutable"
2021
- "opensuse-15-1&&immutable"
2122
- "oraclelinux-7&&immutable"
2223
- "oraclelinux-8&&immutable"

‎.ci/jobs.t/elastic+elasticsearch+periodic+release-tests.yml

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,14 @@
1414
JAVA15_HOME=$HOME/.java/openjdk15
1515
- shell: |
1616
#!/usr/local/bin/runbld --redirect-stderr
17+
18+
# Fetch beats artifacts
19+
export ES_VERSION=$(grep 'elasticsearch' build-tools-internal/version.properties | awk '{print $3}')
20+
export BEATS_DIR=$(pwd)/distribution/docker/build/artifacts/beats
21+
22+
mkdir -p ${BEATS_DIR}
23+
curl -o "${BEATS_DIR}/metricbeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/metricbeat/metricbeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
24+
curl -o "${BEATS_DIR}/filebeat-${ES_VERSION}-linux-x86_64.tar.gz" https://snapshots-no-kpi.elastic.co/downloads/beats/filebeat/filebeat-${ES_VERSION}-SNAPSHOT-linux-x86_64.tar.gz
25+
1726
$WORKSPACE/.ci/scripts/run-gradle.sh -Dbwc.checkout.align=true -Dbuild.snapshot=false \
18-
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key build
27+
-Dtests.jvm.argline=-Dbuild.snapshot=false -Dlicense.key=${WORKSPACE}/x-pack/license-tools/src/test/resources/public.key -Dbuild.id=deadbeef build

‎.ci/jobs.t/elastic+elasticsearch+pull-request+bwc.yml

Lines changed: 36 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,37 @@
11
---
2-
jjbb-template: pull-request-gradle-unix.yml
3-
vars:
4-
- pr-job: "bwc"
5-
- gradle-args: "-Dignore.tests.seed bwcTestSnapshots"
2+
- job:
3+
name: "elastic+elasticsearch+pull-request+bwc"
4+
display-name: "elastic / elasticsearch - pull request bwc"
5+
description: "Testing of Elasticsearch pull requests - bwc"
6+
workspace: "/dev/shm/elastic+elasticsearch+pull-request+bwc"
7+
scm:
8+
- git:
9+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
10+
branches:
11+
- "${ghprbActualCommit}"
12+
triggers:
13+
- github-pull-request:
14+
org-list:
15+
- elastic
16+
allow-whitelist-orgs-as-admins: true
17+
trigger-phrase: '.*run\W+elasticsearch-ci/bwc.*'
18+
github-hooks: true
19+
status-context: elasticsearch-ci/bwc
20+
cancel-builds-on-update: true
21+
excluded-regions:
22+
- ^docs/.*
23+
black-list-labels:
24+
- '>test-mute'
25+
- 'test-full-bwc'
26+
builders:
27+
- inject:
28+
properties-file: '.ci/java-versions.properties'
29+
properties-content: |
30+
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
31+
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
32+
JAVA8_HOME=$HOME/.java/java8
33+
JAVA11_HOME=$HOME/.java/java11
34+
JAVA15_HOME=$HOME/.java/openjdk15
35+
- shell: |
36+
#!/usr/local/bin/runbld --redirect-stderr
37+
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed bwcTestSnapshots

‎.ci/jobs.t/elastic+elasticsearch+pull-request+full-bwc.yml

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,50 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+pull-request+full-bwc"
4+
display-name: "elastic / elasticsearch - pull request full-bwc"
5+
description: "Testing of Elasticsearch pull requests - full-bwc"
6+
project-type: matrix
7+
node: master
8+
child-workspace: "/dev/shm/elastic+elasticsearch+pull-request+full-bwc"
9+
scm:
10+
- git:
11+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
12+
branches:
13+
- "${ghprbActualCommit}"
14+
triggers:
15+
- github-pull-request:
16+
org-list:
17+
- elastic
18+
allow-whitelist-orgs-as-admins: true
19+
trigger-phrase: '.*run\W+elasticsearch-ci/full-bwc.*'
20+
github-hooks: true
21+
status-context: elasticsearch-ci/full-bwc
22+
cancel-builds-on-update: true
23+
excluded-regions:
24+
- ^docs/.*
25+
white-list-labels:
26+
- 'test-full-bwc'
27+
black-list-labels:
28+
- '>test-mute'
29+
axes:
30+
- axis:
31+
type: slave
32+
name: nodes
33+
values:
34+
- "general-purpose"
35+
- axis:
36+
type: yaml
37+
filename: ".ci/bwcVersions"
38+
name: "BWC_VERSION"
39+
builders:
40+
- inject:
41+
properties-file: '.ci/java-versions.properties'
42+
properties-content: |
43+
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
44+
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
45+
JAVA8_HOME=$HOME/.java/java8
46+
JAVA11_HOME=$HOME/.java/java11
47+
JAVA15_HOME=$HOME/.java/openjdk15
48+
- shell: |
49+
#!/usr/local/bin/runbld --redirect-stderr
50+
$WORKSPACE/.ci/scripts/run-gradle.sh -Dignore.tests.seed v$BWC_VERSION#bwcTest

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-unix.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
- centos-8-packaging
3737
- debian-9-packaging
3838
- debian-10-packaging
39+
- debian-11-packaging
3940
- opensuse-15-1-packaging
4041
- oraclelinux-7-packaging
4142
- oraclelinux-8-packaging

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-nojdk.yml

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+pull-request+packaging-tests-windows-nojdk"
4+
display-name: "elastic / elasticsearch - pull request packaging-tests-windows-nojdk"
5+
description: "Testing of Elasticsearch pull requests - packaging-tests-windows-nojdk"
6+
# We use a hard-coded workspace directory here to avoid hitting windows path length limits
7+
child-workspace: "C:\\Users\\jenkins\\workspace\\pr-packaging-windows\\${BUILD_NUMBER}"
8+
project-type: matrix
9+
node: master
10+
scm:
11+
- git:
12+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
13+
branches:
14+
- "${ghprbActualCommit}"
15+
triggers:
16+
- github-pull-request:
17+
org-list:
18+
- elastic
19+
allow-whitelist-orgs-as-admins: true
20+
trigger-phrase: '.*run\W+elasticsearch-ci/packaging-tests-windows.*'
21+
github-hooks: true
22+
status-context: elasticsearch-ci/packaging-tests-windows
23+
cancel-builds-on-update: true
24+
# We've removed the no-jdk distribution on master as well
25+
black-list-target-branches:
26+
- master
27+
- 6.8
28+
excluded-regions:
29+
- ^docs/.*
30+
white-list-labels:
31+
- ':Delivery/Packaging'
32+
black-list-labels:
33+
- '>test-mute'
34+
axes:
35+
- axis:
36+
type: label-expression
37+
name: os
38+
values:
39+
- "windows-2012-r2"
40+
- "windows-2016"
41+
- "windows-2019"
42+
- axis:
43+
type: user-defined
44+
name: PACKAGING_TASK
45+
values:
46+
- 'default-windows-archive'
47+
- 'default-windows-archive-no-jdk'
48+
builders:
49+
- inject:
50+
properties-file: '.ci/java-versions.properties'
51+
properties-content: |
52+
JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
53+
RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
54+
- batch: |
55+
del /f /s /q %USERPROFILE%\.gradle\init.d\*.*
56+
mkdir %USERPROFILE%\.gradle\init.d
57+
copy .ci\init.gradle %USERPROFILE%\.gradle\init.d\
58+
(
59+
echo powershell.exe .\.ci\scripts\packaging-test.ps1 -GradleTasks destructiveDistroTest.%PACKAGING_TASK% ^|^| exit /b 1
60+
) | java -jar "C:\Program Files\infra\bin\runbld" --redirect-stderr -

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample-nojdk.yml

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+pull-request+packaging-tests-windows-sample-nojdk"
4+
display-name: "elastic / elasticsearch - pull request packaging-tests-windows-sample-nojdk"
5+
description: "Testing of Elasticsearch pull requests - packaging-tests-windows-sample-nojdk"
6+
# We use a hard-coded workspace directory here to avoid hitting windows path length limits
7+
child-workspace: "C:\\Users\\jenkins\\workspace\\pr-packaging-windows\\${BUILD_NUMBER}"
8+
project-type: matrix
9+
node: master
10+
scm:
11+
- git:
12+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
13+
branches:
14+
- "${ghprbActualCommit}"
15+
triggers:
16+
- github-pull-request:
17+
org-list:
18+
- elastic
19+
allow-whitelist-orgs-as-admins: true
20+
trigger-phrase: '.*run\W+elasticsearch-ci/packaging-tests-windows-sample.*'
21+
github-hooks: true
22+
status-context: elasticsearch-ci/packaging-tests-windows-sample
23+
cancel-builds-on-update: true
24+
# We've removed the no-jdk distribution on master as well
25+
black-list-target-branches:
26+
- master
27+
- 6.8
28+
excluded-regions:
29+
- ^docs/.*
30+
black-list-labels:
31+
- '>test-mute'
32+
- ':Delivery/Packaging'
33+
axes:
34+
- axis:
35+
type: label-expression
36+
name: os
37+
values:
38+
- "windows-2019"
39+
- axis:
40+
type: user-defined
41+
name: PACKAGING_TASK
42+
values:
43+
- 'default-windows-archive'
44+
- 'default-windows-archive-no-jdk'
45+
builders:
46+
- inject:
47+
properties-file: '.ci/java-versions.properties'
48+
properties-content: |
49+
JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
50+
RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
51+
- batch: |
52+
del /f /s /q %USERPROFILE%\.gradle\init.d\*.*
53+
mkdir %USERPROFILE%\.gradle\init.d
54+
copy .ci\init.gradle %USERPROFILE%\.gradle\init.d\
55+
(
56+
echo powershell.exe .\.ci\scripts\packaging-test.ps1 -GradleTasks destructiveDistroTest.%PACKAGING_TASK% ^|^| exit /b 1
57+
) | java -jar "C:\Program Files\infra\bin\runbld" --redirect-stderr -

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
github-hooks: true
2222
status-context: elasticsearch-ci/packaging-tests-windows-sample
2323
cancel-builds-on-update: true
24-
black-list-target-branches:
25-
- 6.8
24+
white-list-target-branches:
25+
- master
2626
excluded-regions:
2727
- ^docs/.*
2828
black-list-labels:
@@ -39,7 +39,6 @@
3939
name: PACKAGING_TASK
4040
values:
4141
- 'default-windows-archive'
42-
- 'default-windows-archive-no-jdk'
4342
builders:
4443
- inject:
4544
properties-file: '.ci/java-versions.properties'

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
github-hooks: true
2222
status-context: elasticsearch-ci/packaging-tests-windows
2323
cancel-builds-on-update: true
24-
black-list-target-branches:
25-
- 6.8
24+
white-list-target-branches:
25+
- master
2626
excluded-regions:
2727
- ^docs/.*
2828
white-list-labels:
@@ -42,7 +42,6 @@
4242
name: PACKAGING_TASK
4343
values:
4444
- 'default-windows-archive'
45-
- 'default-windows-archive-no-jdk'
4645
builders:
4746
- inject:
4847
properties-file: '.ci/java-versions.properties'

‎.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-upgrade-tests.yml

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
---
2+
- job:
3+
name: "elastic+elasticsearch+pull-request+packaging-upgrade-tests"
4+
display-name: "elastic / elasticsearch - pull request packaging-upgrade-tests"
5+
description: "Testing of Elasticsearch pull requests - packaging-upgrade-tests"
6+
project-type: matrix
7+
node: master
8+
child-workspace: "/dev/shm/elastic+elasticsearch+pull-request+packaging-upgrade-tests"
9+
scm:
10+
- git:
11+
refspec: "+refs/pull/${ghprbPullId}/*:refs/remotes/origin/pr/${ghprbPullId}/*"
12+
branches:
13+
- "${ghprbActualCommit}"
14+
triggers:
15+
- github-pull-request:
16+
org-list:
17+
- elastic
18+
allow-whitelist-orgs-as-admins: true
19+
trigger-phrase: '.*run\W+elasticsearch-ci/packaging-upgrade-tests.*'
20+
github-hooks: true
21+
status-context: elasticsearch-ci/packaging-upgrade-tests
22+
cancel-builds-on-update: true
23+
black-list-target-branches:
24+
- 6.8
25+
excluded-regions:
26+
- ^docs/.*
27+
white-list-labels:
28+
- ':Delivery/Packaging'
29+
black-list-labels:
30+
- '>test-mute'
31+
axes:
32+
- axis:
33+
type: label-expression
34+
name: os
35+
values:
36+
- centos-8-packaging
37+
- ubuntu-20.04-packaging
38+
- axis:
39+
type: yaml
40+
filename: ".ci/bwcVersions"
41+
name: "BWC_VERSION"
42+
builders:
43+
- inject:
44+
properties-file: '.ci/java-versions.properties'
45+
properties-content: |
46+
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
47+
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
48+
JAVA8_HOME=$HOME/.java/java8
49+
JAVA11_HOME=$HOME/.java/java11
50+
JAVA15_HOME=$HOME/.java/openjdk15
51+
- shell: |
52+
#!/usr/local/bin/runbld --redirect-stderr
53+
./.ci/os.sh --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/ destructiveDistroUpgradeTest.v$BWC_VERSION

‎.editorconfig

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,9 @@ ij_continuation_indent_size = 2
1919
indent_size = 2
2020
max_line_length = 150
2121

22+
[*.md]
23+
max_line_length = 80
24+
2225
[*.groovy]
2326
indent_size = 4
2427
ij_continuation_indent_size = 4

0 commit comments

Comments
 (0)