Merge branch 'main' into analytics-logging

Author: smalyshev

.buildkite/pipelines/intake.template.yml

@@ -107,7 +107,7 @@ steps:
   - trigger: elasticsearch-dra-workflow
     label: Trigger DRA snapshot workflow
     async: true
-    branches: "main 9.* 8.* 7.17"
+    branches: "main 9.* 8.*"
     build:
       branch: "$BUILDKITE_BRANCH"
       commit: "$BUILDKITE_COMMIT"

.buildkite/pipelines/intake.yml

@@ -108,7 +108,7 @@ steps:
   - trigger: elasticsearch-dra-workflow
     label: Trigger DRA snapshot workflow
     async: true
-    branches: "main 9.* 8.* 7.17"
+    branches: "main 9.* 8.*"
     build:
       branch: "$BUILDKITE_BRANCH"
       commit: "$BUILDKITE_COMMIT"

.buildkite/pipelines/periodic-java-ea.template.yml

@@ -74,7 +74,7 @@ steps:
           machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
-          GRADLE_PARAMS: "-Druntime.java=$$JAVA_EA_VERSION"
+          GRADLE_PARAMS: "-Druntime.java=$JAVA_EA_VERSION"
           GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
       - label: "{{matrix.BWC_VERSION}} / matrix-bwc"
         command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION  -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest

.buildkite/pipelines/periodic-java-ea.yml

@@ -550,7 +550,7 @@ steps:
           machineType: n1-standard-32
           buildDirectory: /dev/shm/bk
         env:
-          GRADLE_PARAMS: "-Druntime.java=$$JAVA_EA_VERSION"
+          GRADLE_PARAMS: "-Druntime.java=$JAVA_EA_VERSION"
           GRADLE_TASK: "{{matrix.GRADLE_TASK}}"
       - label: "{{matrix.BWC_VERSION}} / matrix-bwc"
         command: .ci/scripts/run-gradle.sh -Druntime.java=$$JAVA_EA_VERSION  -Dbwc.checkout.align=true v$$BWC_VERSION#bwcTest

.buildkite/pipelines/pull-request/part-3.yml

@@ -1,5 +1,3 @@
-config:
-  skip-target-branches: "7.17"
 steps:
   - label: part-3
     command: .ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart3

.buildkite/pipelines/pull-request/part-4.yml

@@ -1,5 +1,3 @@
-config:
-  skip-target-branches: "7.17"
 steps:
   - label: part-4
     command: .ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart4

.buildkite/pipelines/pull-request/part-5.yml

@@ -1,5 +1,3 @@
-config:
-  skip-target-branches: "7.17"
 steps:
   - label: part-5
     command: .ci/scripts/run-gradle.sh -Dignore.tests.seed checkPart5

.buildkite/pipelines/pull-request/rest-compatibility.yml

@@ -1,5 +1,3 @@
-config:
-  skip-target-branches: "7.17"
 steps:
   - label: rest-compatibility
     command: .ci/scripts/run-gradle.sh -Dignore.tests.seed checkRestCompat

.buildkite/scripts/dra-update-staging.sh

@@ -6,7 +6,7 @@ source .buildkite/scripts/branches.sh
 
 for BRANCH in "${BRANCHES[@]}"; do
   # Don't publish main branch to staging
-  if [[ "$BRANCH" == "main" || "$BRANCH" == "7.17" ]]; then
+  if [[ "$BRANCH" == "main" ]]; then
     continue
   fi
 

.buildkite/scripts/dra-workflow.trigger.sh

@@ -46,18 +46,4 @@ for BRANCH in "${BRANCHES[@]}"; do
         DRA_WORKFLOW: staging
         VERSION_QUALIFIER: ${VERSION_QUALIFIER:-}
 EOF
-
-  if [ "$BRANCH" = "7.17" ]; then
-    cat <<EOF
-  - trigger: elasticsearch-dra-workflow
-    label: Trigger DRA snapshot workflow for $BRANCH
-    async: true
-    build:
-      branch: "$BRANCH"
-      commit: "$LAST_GOOD_COMMIT"
-      env:
-        DRA_WORKFLOW: snapshot
-        VERSION_QUALIFIER: ${VERSION_QUALIFIER:-}
-EOF
-  fi
 done