Merge branch 'main' into entitlements/test_simplfiication

rjernst · Dec 13, 2024 · 51aeb74 · 51aeb74
2 parents 84a8ee3 + 4279281
commit 51aeb74
Show file tree

Hide file tree

Showing 160 changed files with 1,666 additions and 845 deletions.
diff --git a/.buildkite/pipelines/intake.yml b/.buildkite/pipelines/intake.yml
@@ -56,7 +56,7 @@ steps:
         timeout_in_minutes: 300
         matrix:
           setup:
-            BWC_VERSION: ["8.16.2", "8.17.0", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.2", "8.17.1", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/periodic-packaging.template.yml b/.buildkite/pipelines/periodic-packaging.template.yml
@@ -10,6 +10,7 @@ steps:
               - debian-12
               - opensuse-leap-15
               - oraclelinux-8
+              - oraclelinux-9
               - sles-15
               - ubuntu-2004
               - ubuntu-2204

diff --git a/.buildkite/pipelines/periodic-packaging.yml b/.buildkite/pipelines/periodic-packaging.yml
@@ -11,6 +11,7 @@ steps:
               - debian-12
               - opensuse-leap-15
               - oraclelinux-8
+              - oraclelinux-9
               - sles-15
               - ubuntu-2004
               - ubuntu-2204
@@ -301,8 +302,8 @@ steps:
         env:
           BWC_VERSION: 8.16.2
 
-      - label: "{{matrix.image}} / 8.17.0 / packaging-tests-upgrade"
-        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.0
+      - label: "{{matrix.image}} / 8.17.1 / packaging-tests-upgrade"
+        command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.17.1
         timeout_in_minutes: 300
         matrix:
           setup:
@@ -315,7 +316,7 @@ steps:
           machineType: custom-16-32768
           buildDirectory: /dev/shm/bk
         env:
-          BWC_VERSION: 8.17.0
+          BWC_VERSION: 8.17.1
 
       - label: "{{matrix.image}} / 8.18.0 / packaging-tests-upgrade"
         command: ./.ci/scripts/packaging-test.sh -Dbwc.checkout.align=true destructiveDistroUpgradeTest.v8.18.0

diff --git a/.buildkite/pipelines/periodic-platform-support.yml b/.buildkite/pipelines/periodic-platform-support.yml
@@ -10,6 +10,7 @@ steps:
               - debian-12
               - opensuse-leap-15
               - oraclelinux-8
+              - oraclelinux-9
               - sles-15
               - ubuntu-2004
               - ubuntu-2204

diff --git a/.buildkite/pipelines/periodic.yml b/.buildkite/pipelines/periodic.yml
@@ -325,8 +325,8 @@ steps:
             - signal_reason: agent_stop
               limit: 3
 
-      - label: 8.17.0 / bwc
-        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.0#bwcTest
+      - label: 8.17.1 / bwc
+        command: .ci/scripts/run-gradle.sh -Dbwc.checkout.align=true v8.17.1#bwcTest
         timeout_in_minutes: 300
         agents:
           provider: gcp
@@ -335,7 +335,7 @@ steps:
           buildDirectory: /dev/shm/bk
           preemptible: true
         env:
-          BWC_VERSION: 8.17.0
+          BWC_VERSION: 8.17.1
         retry:
           automatic:
             - exit_status: "-1"
@@ -448,7 +448,7 @@ steps:
           setup:
             ES_RUNTIME_JAVA:
               - openjdk21
-            BWC_VERSION: ["8.16.2", "8.17.0", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.2", "8.17.1", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004
@@ -490,7 +490,7 @@ steps:
             ES_RUNTIME_JAVA:
               - openjdk21
               - openjdk23
-            BWC_VERSION: ["8.16.2", "8.17.0", "8.18.0", "9.0.0"]
+            BWC_VERSION: ["8.16.2", "8.17.1", "8.18.0", "9.0.0"]
         agents:
           provider: gcp
           image: family/elasticsearch-ubuntu-2004

diff --git a/.buildkite/pipelines/pull-request/packaging-tests-unix.yml b/.buildkite/pipelines/pull-request/packaging-tests-unix.yml
@@ -13,6 +13,7 @@ steps:
               - debian-12
               - opensuse-leap-15
               - oraclelinux-8
+              - oraclelinux-9
               - sles-15
               - ubuntu-2004
               - ubuntu-2204

diff --git a/.buildkite/pipelines/pull-request/part-1-entitlements.yml b/.buildkite/pipelines/pull-request/part-1-entitlements.yml
@@ -0,0 +1,11 @@
+config:
+  allow-labels: "test-entitlements"
+steps:
+  - label: part-1-entitlements
+    command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.jvm.argline="-Des.entitlements.enabled=true" checkPart1
+    timeout_in_minutes: 300
+    agents:
+      provider: gcp
+      image: family/elasticsearch-ubuntu-2004
+      machineType: custom-32-98304
+      buildDirectory: /dev/shm/bk
diff --git a/.buildkite/pipelines/pull-request/part-2-entitlements.yml b/.buildkite/pipelines/pull-request/part-2-entitlements.yml
@@ -0,0 +1,11 @@
+config:
+  allow-labels: "test-entitlements"
+steps:
+  - label: part-2-entitlements
+    command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.jvm.argline="-Des.entitlements.enabled=true" checkPart2
+    timeout_in_minutes: 300
+    agents:
+      provider: gcp
+      image: family/elasticsearch-ubuntu-2004
+      machineType: custom-32-98304
+      buildDirectory: /dev/shm/bk
diff --git a/.buildkite/pipelines/pull-request/part-3-entitlements.yml b/.buildkite/pipelines/pull-request/part-3-entitlements.yml
@@ -0,0 +1,11 @@
+config:
+  allow-labels: "test-entitlements"
+steps:
+  - label: part-3-entitlements
+    command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.jvm.argline="-Des.entitlements.enabled=true" checkPart3
+    timeout_in_minutes: 300
+    agents:
+      provider: gcp
+      image: family/elasticsearch-ubuntu-2004
+      machineType: custom-32-98304
+      buildDirectory: /dev/shm/bk
diff --git a/.buildkite/pipelines/pull-request/part-4-entitlements.yml b/.buildkite/pipelines/pull-request/part-4-entitlements.yml
@@ -0,0 +1,11 @@
+config:
+  allow-labels: "test-entitlements"
+steps:
+  - label: part-4-entitlements
+    command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.jvm.argline="-Des.entitlements.enabled=true" checkPart4
+    timeout_in_minutes: 300
+    agents:
+      provider: gcp
+      image: family/elasticsearch-ubuntu-2004
+      machineType: custom-32-98304
+      buildDirectory: /dev/shm/bk
diff --git a/.buildkite/pipelines/pull-request/part-5-entitlements.yml b/.buildkite/pipelines/pull-request/part-5-entitlements.yml
@@ -0,0 +1,11 @@
+config:
+  allow-labels: "test-entitlements"
+steps:
+  - label: part-5-entitlements
+    command: .ci/scripts/run-gradle.sh -Dignore.tests.seed -Dtests.jvm.argline="-Des.entitlements.enabled=true" checkPart5
+    timeout_in_minutes: 300
+    agents:
+      provider: gcp
+      image: family/elasticsearch-ubuntu-2004
+      machineType: custom-32-98304
+      buildDirectory: /dev/shm/bk
diff --git a/.ci/bwcVersions b/.ci/bwcVersions
@@ -16,6 +16,6 @@ BWC_VERSION:
   - "8.14.3"
   - "8.15.5"
   - "8.16.2"
-  - "8.17.0"
+  - "8.17.1"
   - "8.18.0"
   - "9.0.0"
diff --git a/.ci/snapshotBwcVersions b/.ci/snapshotBwcVersions
@@ -1,5 +1,5 @@
 BWC_VERSION:
   - "8.16.2"
-  - "8.17.0"
+  - "8.17.1"
   - "8.18.0"
   - "9.0.0"
diff --git a/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java b/build-tools/src/main/java/org/elasticsearch/gradle/testclusters/ElasticsearchNode.java
@@ -876,10 +876,8 @@ private void startElasticsearchProcess() {
         // Don't inherit anything from the environment for as that would lack reproducibility
         environment.clear();
         environment.putAll(getESEnvironment());
-        if (cliJvmArgs.isEmpty() == false) {
-            String cliJvmArgsString = String.join(" ", cliJvmArgs);
-            environment.put("CLI_JAVA_OPTS", cliJvmArgsString);
-        }
+        String cliJvmArgsString = String.join(" ", cliJvmArgs);
+        environment.put("CLI_JAVA_OPTS", cliJvmArgsString + " " + System.getProperty("tests.jvm.argline", ""));
 
         // Direct the stderr to the ES log file. This should capture any jvm problems to start.
         // Stdout is discarded because ES duplicates the log file to stdout when run in the foreground.

diff --git a/docs/changelog/104683.yaml b/docs/changelog/104683.yaml
diff --git a/docs/changelog/112881.yaml b/docs/changelog/112881.yaml
diff --git a/docs/changelog/112989.yaml b/docs/changelog/112989.yaml
diff --git a/docs/changelog/113194.yaml b/docs/changelog/113194.yaml
diff --git a/docs/changelog/113713.yaml b/docs/changelog/113713.yaml
diff --git a/docs/changelog/113920.yaml b/docs/changelog/113920.yaml
diff --git a/docs/changelog/114334.yaml b/docs/changelog/114334.yaml
diff --git a/docs/changelog/114482.yaml b/docs/changelog/114482.yaml
diff --git a/docs/changelog/114484.yaml b/docs/changelog/114484.yaml
diff --git a/docs/changelog/114620.yaml b/docs/changelog/114620.yaml
diff --git a/docs/changelog/114665.yaml b/docs/changelog/114665.yaml
diff --git a/docs/changelog/114681.yaml b/docs/changelog/114681.yaml
diff --git a/docs/changelog/114742.yaml b/docs/changelog/114742.yaml
diff --git a/docs/changelog/114819.yaml b/docs/changelog/114819.yaml
diff --git a/docs/changelog/114855.yaml b/docs/changelog/114855.yaml
diff --git a/docs/changelog/114862.yaml b/docs/changelog/114862.yaml
diff --git a/docs/changelog/114869.yaml b/docs/changelog/114869.yaml
diff --git a/docs/changelog/114899.yaml b/docs/changelog/114899.yaml
diff --git a/docs/changelog/114924.yaml b/docs/changelog/114924.yaml
diff --git a/docs/changelog/114934.yaml b/docs/changelog/114934.yaml
diff --git a/docs/changelog/114964.yaml b/docs/changelog/114964.yaml
diff --git a/docs/changelog/115041.yaml b/docs/changelog/115041.yaml
diff --git a/docs/changelog/115091.yaml b/docs/changelog/115091.yaml
diff --git a/docs/changelog/115102.yaml b/docs/changelog/115102.yaml
diff --git a/docs/changelog/115142.yaml b/docs/changelog/115142.yaml
diff --git a/docs/changelog/115266.yaml b/docs/changelog/115266.yaml
diff --git a/docs/changelog/115359.yaml b/docs/changelog/115359.yaml
diff --git a/docs/changelog/115414.yaml b/docs/changelog/115414.yaml
diff --git a/docs/changelog/115585.yaml b/docs/changelog/115585.yaml
diff --git a/docs/changelog/115640.yaml b/docs/changelog/115640.yaml
diff --git a/docs/changelog/115655.yaml b/docs/changelog/115655.yaml
diff --git a/docs/changelog/115678.yaml b/docs/changelog/115678.yaml