Merge branch 'main' into rn-test2

Author: lcawl

.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/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/pull-requests.json

@@ -8,7 +8,7 @@
         "admin",
         "write"
       ],
-      "allowed_list": ["elastic-renovate-prod[bot]"],
+      "allowed_list": ["elastic-renovate-prod[bot]", "github-actions[bot]"],
       "set_commit_status": false,
       "build_on_commit": true,
       "build_on_comment": true,

.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

.buildkite/scripts/periodic.trigger.sh

@@ -11,11 +11,6 @@ IS_FIRST=true
 SKIP_DELAY="${SKIP_DELAY:-false}"
 
 for BRANCH in "${BRANCHES[@]}"; do
-  # Removing 7.17 periodic branch builds
-  if [[ $BRANCH == "7.17" ]];
-  then
-    continue;
-  fi
   INTAKE_PIPELINE_SLUG="elasticsearch-intake"
   BUILD_JSON=$(curl -sH "Authorization: Bearer ${BUILDKITE_API_TOKEN}" "https://api.buildkite.com/v2/organizations/elastic/pipelines/${INTAKE_PIPELINE_SLUG}/builds?branch=${BRANCH}&state=passed&per_page=1" | jq '.[0] | {commit: .commit, url: .web_url}')
   LAST_GOOD_COMMIT=$(echo "${BUILD_JSON}" | jq -r '.commit')

.github/updatecli/values.d/ironbank.yml

@@ -1,3 +1,12 @@
 config:
   - path: distribution/docker/src/docker/iron_bank
-    dockerfile: ../Dockerfile
+    dockerfile: ../dockerfiles/ironbank/Dockerfile
+
+pull_request:
+  labels:
+    - ":Delivery/Tooling"
+    - ":Delivery/Packaging"
+    - "auto-merge-without-approval"
+    - "dependencies"
+    - ">non-issue"
+