Skip to content

Commit 26b255f

Browse files
tlrxtlrx
committed
Merge branch 'master' into delete-searchable-snapshot-with-pending-deletes
2 parents 086889d + 9b058da commit 26b255f

File tree

11,734 files changed

+486205
-305130
lines changed

Some content is hidden

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

11,734 files changed

+486205
-305130
lines changed

‎.backportrc.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"upstream": "elastic/elasticsearch",
33
"targetBranchChoices": [
4-
{ "name": "master", "checked": true },
5-
{ "name": "7.x", "checked": true },
4+
"master",
5+
"8.0",
6+
"7.16",
67
"7.15",
78
"7.14",
89
"6.8"
910
],
1011
"targetPRLabels": ["backport"],
1112
"branchLabelMapping": {
12-
"^v8.0.0$": "master",
13-
"^v7.16.0$": "7.x",
14-
"^v(\\d+).(\\d+).\\d+$": "$1.$2"
13+
"^v8.1.0$": "master",
14+
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$": "$1.$2"
1515
}
1616
}

‎.ci/bwcVersions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ BWC_VERSION:
4646
- "7.15.2"
4747
- "7.16.0"
4848
- "8.0.0"
49+
- "8.1.0"

‎.ci/java-versions-aarch64.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# are 'java' or 'openjdk' followed by the major release number.
66

77
ES_BUILD_JAVA=jdk16
8-
ES_RUNTIME_JAVA=jdk16
8+
ES_RUNTIME_JAVA=jdk17

‎.ci/java-versions-fips.properties‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
# This file is used when building pull requests with FIPS enabled
2+
3+
# This .properties file defines the versions of Java with which to
4+
# build and test Elasticsearch for this branch. Valid Java versions
5+
# are 'java' or 'openjdk' followed by the major release number.
6+
7+
ES_BUILD_JAVA=openjdk16
8+
ES_RUNTIME_JAVA=openjdk17

‎.ci/java-versions.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,4 @@
55
# are 'java' or 'openjdk' followed by the major release number.
66

77
ES_BUILD_JAVA=openjdk16
8-
ES_RUNTIME_JAVA=java11
8+
ES_RUNTIME_JAVA=openjdk17

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
values:
1616
- centos-7-packaging
1717
- centos-8-packaging
18-
- debian-9-packaging
1918
- debian-10-packaging
2019
- debian-11-packaging
2120
- opensuse-15-1-packaging
@@ -26,6 +25,9 @@
2625
- ubuntu-18.04-packaging
2726
- ubuntu-20.04-packaging
2827
- rocky-linux-8-packaging
28+
- rhel-7-packaging
29+
- rhel-8-packaging
30+
- almalinux-8-packaging
2931
builders:
3032
- inject:
3133
properties-file: '.ci/java-versions.properties'

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
COMPOSE_HTTP_TIMEOUT=120
2424
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
2525
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
26+
JAVA11_HOME=$HOME/.java/jdk11
2627
JAVA15_HOME=$HOME/.java/jdk15
2728
- shell: |
2829
#!/usr/local/bin/runbld --redirect-stderr

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
properties-content: |
1111
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
1212
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
13+
JAVA11_HOME=$HOME/.java/java11
1314
JAVA15_HOME=$HOME/.java/openjdk15
1415
- shell: |
1516
#!/usr/local/bin/runbld --redirect-stderr

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
values:
1616
- "centos-7&&immutable"
1717
- "centos-8&&immutable"
18-
- "debian-9&&immutable"
18+
- "amazon&&immutable"
1919
- "debian-10&&immutable"
2020
- "debian-11&&immutable"
2121
- "opensuse-15-1&&immutable"
@@ -26,12 +26,16 @@
2626
- "ubuntu-18.04&&immutable"
2727
- "ubuntu-20.04&&immutable"
2828
- "rocky-linux-8&&immutable"
29+
- "rhel-7&&immutable"
30+
- "rhel-8&&immutable"
31+
- "almalinux-8&&immutable"
2932
builders:
3033
- inject:
3134
properties-file: '.ci/java-versions.properties'
3235
properties-content: |
3336
JAVA_HOME=$HOME/.java/$ES_BUILD_JAVA
3437
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
38+
JAVA11_HOME=$HOME/.java/java11
3539
JAVA15_HOME=$HOME/.java/openjdk15
3640
- shell: |
3741
#!/usr/local/bin/runbld --redirect-stderr

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
properties-content: |
3535
JAVA_HOME=$USERPROFILE\\.java\\$ES_BUILD_JAVA
3636
RUNTIME_JAVA_HOME=$USERPROFILE\\.java\\$ES_RUNTIME_JAVA
37+
JAVA11_HOME=$USERPROFILE\\.java\\java11
3738
JAVA15_HOME=$USERPROFILE\\.java\\openjdk15
3839
- batch: |
3940
del /f /s /q %USERPROFILE%\.gradle\init.d\*.*

0 commit comments

Comments
 (0)