Skip to content

Commit be6f4c6

Browse files
breskebybreskeby
authored
Merge branch 'main' into add-fips-docker-image
2 parents 1ebfda1 + 5997fc3 commit be6f4c6

File tree

753 files changed

+24383
-5833
lines changed

Some content is hidden

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

753 files changed

+24383
-5833
lines changed

‎.buildkite/pipelines/intake.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ steps:
5656
timeout_in_minutes: 300
5757
matrix:
5858
setup:
59-
BWC_VERSION: ["8.16.2", "8.17.0", "8.18.0", "9.0.0"]
59+
BWC_VERSION: ["8.15.6", "8.16.2", "8.17.0", "8.18.0", "9.0.0"]
6060
agents:
6161
provider: gcp
6262
image: family/elasticsearch-ubuntu-2004

‎.buildkite/pipelines/periodic-packaging.template.yml

-5
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@ steps:
77
matrix:
88
setup:
99
image:
10-
- debian-11
1110
- debian-12
1211
- opensuse-leap-15
13-
- oraclelinux-7
1412
- oraclelinux-8
15-
- sles-12
1613
- sles-15
17-
- ubuntu-1804
1814
- ubuntu-2004
1915
- ubuntu-2204
2016
- rocky-8
2117
- rocky-9
22-
- rhel-7
2318
- rhel-8
2419
- rhel-9
2520
- almalinux-8

‎.buildkite/pipelines/periodic-packaging.yml

-5
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,14 @@ steps:
88
matrix:
99
setup:
1010
image:
11-
- debian-11
1211
- debian-12
1312
- opensuse-leap-15
14-
- oraclelinux-7
1513
- oraclelinux-8
16-
- sles-12
1714
- sles-15
18-
- ubuntu-1804
1915
- ubuntu-2004
2016
- ubuntu-2204
2117
- rocky-8
2218
- rocky-9
23-
- rhel-7
2419
- rhel-8
2520
- rhel-9
2621
- almalinux-8

‎.buildkite/pipelines/periodic-platform-support.yml

-6
Original file line numberDiff line numberDiff line change
@@ -7,19 +7,14 @@ steps:
77
matrix:
88
setup:
99
image:
10-
- debian-11
1110
- debian-12
1211
- opensuse-leap-15
13-
- oraclelinux-7
1412
- oraclelinux-8
15-
- sles-12
1613
- sles-15
17-
- ubuntu-1804
1814
- ubuntu-2004
1915
- ubuntu-2204
2016
- rocky-8
2117
- rocky-9
22-
- rhel-7
2318
- rhel-8
2419
- rhel-9
2520
- almalinux-8
@@ -90,7 +85,6 @@ steps:
9085
setup:
9186
image:
9287
- amazonlinux-2023
93-
- amazonlinux-2
9488
agents:
9589
provider: aws
9690
imagePrefix: elasticsearch-{{matrix.image}}

‎.buildkite/pipelines/periodic.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -448,7 +448,7 @@ steps:
448448
setup:
449449
ES_RUNTIME_JAVA:
450450
- openjdk21
451-
BWC_VERSION: ["8.16.2", "8.17.0", "8.18.0", "9.0.0"]
451+
BWC_VERSION: ["8.15.6", "8.16.2", "8.17.0", "8.18.0", "9.0.0"]
452452
agents:
453453
provider: gcp
454454
image: family/elasticsearch-ubuntu-2004
@@ -490,7 +490,7 @@ steps:
490490
ES_RUNTIME_JAVA:
491491
- openjdk21
492492
- openjdk23
493-
BWC_VERSION: ["8.16.2", "8.17.0", "8.18.0", "9.0.0"]
493+
BWC_VERSION: ["8.15.6", "8.16.2", "8.17.0", "8.18.0", "9.0.0"]
494494
agents:
495495
provider: gcp
496496
image: family/elasticsearch-ubuntu-2004

‎.buildkite/pipelines/pull-request/packaging-tests-unix.yml

-5
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,14 @@ steps:
1010
matrix:
1111
setup:
1212
image:
13-
- debian-11
1413
- debian-12
1514
- opensuse-leap-15
16-
- oraclelinux-7
1715
- oraclelinux-8
18-
- sles-12
1916
- sles-15
20-
- ubuntu-1804
2117
- ubuntu-2004
2218
- ubuntu-2204
2319
- rocky-8
2420
- rocky-9
25-
- rhel-7
2621
- rhel-8
2722
- rhel-9
2823
- almalinux-8

‎.ci/snapshotBwcVersions

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
BWC_VERSION:
2+
- "8.15.6"
23
- "8.16.2"
34
- "8.17.0"
45
- "8.18.0"

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionBwcSetupPluginFuncTest.groovy

+14-10
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99

1010
package org.elasticsearch.gradle.internal
1111

12+
import spock.lang.Unroll
13+
1214
import org.elasticsearch.gradle.fixtures.AbstractGitAwareGradleFuncTest
1315
import org.gradle.testkit.runner.TaskOutcome
14-
import spock.lang.Unroll
1516

1617
class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleFuncTest {
1718

@@ -23,8 +24,10 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
2324
apply plugin: 'elasticsearch.internal-distribution-bwc-setup'
2425
"""
2526
execute("git branch origin/8.x", file("cloned"))
27+
execute("git branch origin/8.3", file("cloned"))
28+
execute("git branch origin/8.2", file("cloned"))
29+
execute("git branch origin/8.1", file("cloned"))
2630
execute("git branch origin/7.16", file("cloned"))
27-
execute("git branch origin/7.15", file("cloned"))
2831
}
2932

3033
def "builds distribution from branches via archives extractedAssemble"() {
@@ -48,10 +51,11 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
4851
assertOutputContains(result.output, "[$bwcDistVersion] > Task :distribution:archives:darwin-tar:${expectedAssembleTaskName}")
4952

5053
where:
51-
bwcDistVersion | bwcProject | expectedAssembleTaskName
52-
"8.0.0" | "minor" | "extractedAssemble"
53-
"7.16.0" | "staged" | "extractedAssemble"
54-
"7.15.2" | "bugfix" | "extractedAssemble"
54+
bwcDistVersion | bwcProject | expectedAssembleTaskName
55+
"8.4.0" | "minor" | "extractedAssemble"
56+
"8.3.0" | "staged" | "extractedAssemble"
57+
"8.2.1" | "bugfix" | "extractedAssemble"
58+
"8.1.3" | "bugfix2" | "extractedAssemble"
5559
}
5660

5761
@Unroll
@@ -70,8 +74,8 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
7074

7175
where:
7276
bwcDistVersion | platform
73-
"8.0.0" | "darwin"
74-
"8.0.0" | "linux"
77+
"8.4.0" | "darwin"
78+
"8.4.0" | "linux"
7579
}
7680

7781
def "bwc expanded distribution folder can be resolved as bwc project artifact"() {
@@ -107,11 +111,11 @@ class InternalDistributionBwcSetupPluginFuncTest extends AbstractGitAwareGradleF
107111
result.task(":resolveExpandedDistribution").outcome == TaskOutcome.SUCCESS
108112
result.task(":distribution:bwc:minor:buildBwcDarwinTar").outcome == TaskOutcome.SUCCESS
109113
and: "assemble task triggered"
110-
result.output.contains("[8.0.0] > Task :distribution:archives:darwin-tar:extractedAssemble")
114+
result.output.contains("[8.4.0] > Task :distribution:archives:darwin-tar:extractedAssemble")
111115
result.output.contains("expandedRootPath /distribution/bwc/minor/build/bwc/checkout-8.x/" +
112116
"distribution/archives/darwin-tar/build/install")
113117
result.output.contains("nested folder /distribution/bwc/minor/build/bwc/checkout-8.x/" +
114-
"distribution/archives/darwin-tar/build/install/elasticsearch-8.0.0-SNAPSHOT")
118+
"distribution/archives/darwin-tar/build/install/elasticsearch-8.4.0-SNAPSHOT")
115119
}
116120

117121
}

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/InternalDistributionDownloadPluginFuncTest.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class InternalDistributionDownloadPluginFuncTest extends AbstractGradleFuncTest
5757
5858
elasticsearch_distributions {
5959
test_distro {
60-
version = "8.0.0"
60+
version = "8.4.0"
6161
type = "archive"
6262
platform = "linux"
6363
architecture = Architecture.current();
@@ -87,7 +87,7 @@ class InternalDistributionDownloadPluginFuncTest extends AbstractGradleFuncTest
8787
8888
elasticsearch_distributions {
8989
test_distro {
90-
version = "8.0.0"
90+
version = "8.4.0"
9191
type = "archive"
9292
platform = "linux"
9393
architecture = Architecture.current();

‎build-tools-internal/src/integTest/groovy/org/elasticsearch/gradle/internal/test/rest/LegacyYamlRestCompatTestPluginFuncTest.groovy

+8-8
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
4040
given:
4141
internalBuild()
4242

43-
subProject(":distribution:bwc:staged") << """
43+
subProject(":distribution:bwc:minor") << """
4444
configurations { checkout }
4545
artifacts {
4646
checkout(new File(projectDir, "checkoutDir"))
@@ -61,11 +61,11 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
6161
result.task(transformTask).outcome == TaskOutcome.NO_SOURCE
6262
}
6363

64-
def "yamlRestCompatTest executes and copies api and transforms tests from :bwc:staged"() {
64+
def "yamlRestCompatTest executes and copies api and transforms tests from :bwc:minor"() {
6565
given:
6666
internalBuild()
6767

68-
subProject(":distribution:bwc:staged") << """
68+
subProject(":distribution:bwc:minor") << """
6969
configurations { checkout }
7070
artifacts {
7171
checkout(new File(projectDir, "checkoutDir"))
@@ -98,8 +98,8 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
9898
String api = "foo.json"
9999
String test = "10_basic.yml"
100100
//add the compatible test and api files, these are the prior version's normal yaml rest tests
101-
file("distribution/bwc/staged/checkoutDir/rest-api-spec/src/main/resources/rest-api-spec/api/" + api) << ""
102-
file("distribution/bwc/staged/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/" + test) << ""
101+
file("distribution/bwc/minor/checkoutDir/rest-api-spec/src/main/resources/rest-api-spec/api/" + api) << ""
102+
file("distribution/bwc/minor/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/" + test) << ""
103103

104104
when:
105105
def result = gradleRunner("yamlRestCompatTest").build()
@@ -145,7 +145,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
145145
given:
146146
internalBuild()
147147
withVersionCatalogue()
148-
subProject(":distribution:bwc:staged") << """
148+
subProject(":distribution:bwc:minor") << """
149149
configurations { checkout }
150150
artifacts {
151151
checkout(new File(projectDir, "checkoutDir"))
@@ -186,7 +186,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
186186
given:
187187
internalBuild()
188188

189-
subProject(":distribution:bwc:staged") << """
189+
subProject(":distribution:bwc:minor") << """
190190
configurations { checkout }
191191
artifacts {
192192
checkout(new File(projectDir, "checkoutDir"))
@@ -230,7 +230,7 @@ class LegacyYamlRestCompatTestPluginFuncTest extends AbstractRestResourcesFuncTe
230230

231231
setupRestResources([], [])
232232

233-
file("distribution/bwc/staged/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/test.yml" ) << """
233+
file("distribution/bwc/minor/checkoutDir/src/yamlRestTest/resources/rest-api-spec/test/test.yml" ) << """
234234
"one":
235235
- do:
236236
do_.some.key_to_replace:

‎build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/bwc/bugfix2/build.gradle

Whitespace-only changes.

‎build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/distribution/bwc/maintenance/build.gradle

Whitespace-only changes.

‎build-tools-internal/src/integTest/resources/org/elasticsearch/gradle/internal/fake_git/remote/settings.gradle

+2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
rootProject.name = "root"
1111

1212
include ":distribution:bwc:bugfix"
13+
include ":distribution:bwc:bugfix2"
1314
include ":distribution:bwc:minor"
1415
include ":distribution:bwc:major"
1516
include ":distribution:bwc:staged"
17+
include ":distribution:bwc:maintenance"
1618
include ":distribution:archives:darwin-tar"
1719
include ":distribution:archives:oss-darwin-tar"
1820
include ":distribution:archives:darwin-aarch64-tar"

0 commit comments

Comments
 (0)