Skip to content

Commit 789b1b8

Browse files
limingnihaolimingnihao
authored
Merge branch 'elastic:main' into script_rescorer
2 parents 2dc8bfa + 0df1438 commit 789b1b8

File tree

20,295 files changed

+1254063
-750205
lines changed

Some content is hidden

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

20,295 files changed

+1254063
-750205
lines changed

‎.backportrc.json‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
{
2+
"upstream": "elastic/elasticsearch",
3+
"targetBranchChoices": [
4+
"main",
5+
"8.3",
6+
"8.2",
7+
"8.1",
8+
"8.0",
9+
"7.17",
10+
"6.8"
11+
],
12+
"targetPRLabels": ["backport"],
13+
"branchLabelMapping": {
14+
"^v8.4.0$": "main",
15+
"^v(\\d+).(\\d+).\\d+(?:-(?:alpha|beta|rc)\\d+)?$": "$1.$2"
16+
}
17+
}

‎.ci/bwcVersions‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,5 +37,36 @@ BWC_VERSION:
3737
- "7.13.1"
3838
- "7.13.2"
3939
- "7.13.3"
40+
- "7.13.4"
4041
- "7.14.0"
42+
- "7.14.1"
43+
- "7.14.2"
44+
- "7.15.0"
45+
- "7.15.1"
46+
- "7.15.2"
47+
- "7.16.0"
48+
- "7.16.1"
49+
- "7.16.2"
50+
- "7.16.3"
51+
- "7.17.0"
52+
- "7.17.1"
53+
- "7.17.2"
54+
- "7.17.3"
55+
- "7.17.4"
56+
- "7.17.5"
57+
- "7.17.6"
4158
- "8.0.0"
59+
- "8.0.1"
60+
- "8.1.0"
61+
- "8.1.1"
62+
- "8.1.2"
63+
- "8.1.3"
64+
- "8.2.0"
65+
- "8.2.1"
66+
- "8.2.2"
67+
- "8.2.3"
68+
- "8.3.0"
69+
- "8.3.1"
70+
- "8.3.2"
71+
- "8.3.3"
72+
- "8.4.0"

‎.ci/dockerOnLinuxExclusions‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ sles-12.3 # older version used in Vagrant image
1111
sles-12.5
1212
sles-15.1
1313
sles-15.2
14+
sles-15.3
1415

1516
# These OSes are deprecated and filtered starting with 8.0.0, but need to be excluded
1617
# for PR checks

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# build and test Elasticsearch for this branch. Valid Java versions
55
# are 'java' or 'openjdk' followed by the major release number.
66

7-
ES_BUILD_JAVA=jdk16
8-
ES_RUNTIME_JAVA=jdk16
7+
ES_BUILD_JAVA=jdk17
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=openjdk17
8+
ES_RUNTIME_JAVA=openjdk17

‎.ci/java-versions.properties‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
# build and test Elasticsearch for this branch. Valid Java versions
55
# are 'java' or 'openjdk' followed by the major release number.
66

7-
ES_BUILD_JAVA=openjdk16
8-
ES_RUNTIME_JAVA=openjdk11
7+
ES_BUILD_JAVA=openjdk17
8+
ES_RUNTIME_JAVA=openjdk17

‎.ci/jobs.t/defaults.yml‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
concurrent: true
1616
logrotate:
1717
daysToKeep: 30
18-
numToKeep: 90
18+
numToKeep: 500
1919
artifactDaysToKeep: 7
2020
parameters:
2121
- string:
@@ -53,15 +53,17 @@
5353
url: https://github.com/elastic/elasticsearch/
5454
- inject:
5555
properties-content: |
56+
COMPOSE_HTTP_TIMEOUT=120
5657
JOB_BRANCH=%BRANCH%
5758
HOME=$JENKINS_HOME
5859
GRADLEW=./gradlew --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/
5960
GRADLEW_BAT=./gradlew.bat --parallel --scan --build-cache -Dorg.elasticsearch.build.cache.url=https://gradle-enterprise.elastic.co/cache/
6061
publishers:
61-
- junit:
62-
results: "**/*Junit/*.xml, **/test-results/*/*.xml"
63-
keep-long-stdio: true
64-
allow-empty-results: true
62+
# Disable Junit publisher for now since it's causing OOME on our Jenkins instance
63+
# - junit:
64+
# results: "**/*Junit/*.xml, **/test-results/*/*.xml"
65+
# keep-long-stdio: true
66+
# allow-empty-results: true
6567
# Upload additional logs
6668
- google-cloud-storage:
6769
credentials-id: 'elasticsearch-ci-gcs-plugin'

‎.ci/jobs.t/elastic+elasticsearch+branch-consistency.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
- job:
33
name: elastic+elasticsearch+%BRANCH%+branch-consistency
44
display-name: "elastic / elasticsearch # %BRANCH% - branch consistency"
5-
description: Testing of the Elasticsearch master branch version consistency.
5+
description: Testing of the Elasticsearch %BRANCH% branch version consistency.
66
triggers:
77
- timed: "H 7 * * *"
88
builders:

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

Lines changed: 0 additions & 4 deletions
This file was deleted.

‎.ci/jobs.t/elastic+elasticsearch+intake+multijob+bwc-snapshots.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
---
2+
jjbb-template: matrix-gradle-unix.yml
3+
vars:
4+
- job-name: elastic+elasticsearch+%BRANCH%+intake+multijob+bwc-snapshots
5+
- job-display-name: "elastic / elasticsearch # %BRANCH% - intake bwc"
6+
- job-description: Elasticsearch %BRANCH% branch intake backwards compatibility checks.
7+
- matrix-yaml-file: ".ci/snapshotBwcVersions"
8+
- matrix-variable: BWC_VERSION
9+
- gradle-args: "-Dbwc.checkout.align=true -Dorg.elasticsearch.build.cache.push=true -Dignore.tests.seed -Dscan.capture-task-input-files v$BWC_VERSION#bwcTest"

0 commit comments

Comments
 (0)