Revert build changes from multi-project

Author: tvernum

.buildkite/hooks/pre-command

@@ -44,14 +44,8 @@ export GRADLE_BUILD_CACHE_USERNAME
 GRADLE_BUILD_CACHE_PASSWORD=$(vault read -field=password secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)
 export GRADLE_BUILD_CACHE_PASSWORD
 
-DEVELOCITY_ACCESS_KEY="$(vault read -field=accesskey secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)"
-if [ -n "${DEVELOCITY_ACCESS_KEY}" ]
-then
-    DEVELOCITY_ACCESS_KEY="gradle-enterprise.elastic.co=${DEVELOCITY_ACCESS_KEY}"
-    export DEVELOCITY_ACCESS_KEY
-else
-    printf "%s: Error obtaining DEVELOCITY_ACCESS_KEY from Vault" "$0" | tee -a /dev/stderr
-fi
+DEVELOCITY_ACCESS_KEY="gradle-enterprise.elastic.co=$(vault read -field=accesskey secret/ci/elastic-elasticsearch/migrated/gradle-build-cache)"
+export DEVELOCITY_ACCESS_KEY
 
 BUILDKITE_API_TOKEN=$(vault read -field=token secret/ci/elastic-elasticsearch/buildkite-api-token)
 export BUILDKITE_API_TOKEN

.buildkite/pipelines/intake.template.yml

@@ -92,13 +92,13 @@ steps:
       image: family/elasticsearch-ubuntu-2004
       machineType: custom-32-98304
       buildDirectory: /dev/shm/bk
-  # - wait
-  # - trigger: elasticsearch-dra-workflow
-  #   label: Trigger DRA snapshot workflow
-  #   async: true
-  #   branches: "main 9.* 8.* 7.17"
-  #   build:
-  #     branch: "$BUILDKITE_BRANCH"
-  #     commit: "$BUILDKITE_COMMIT"
-  #     env:
-  #       DRA_WORKFLOW: snapshot
+  - wait
+  - trigger: elasticsearch-dra-workflow
+    label: Trigger DRA snapshot workflow
+    async: true
+    branches: "main 9.* 8.* 7.17"
+    build:
+      branch: "$BUILDKITE_BRANCH"
+      commit: "$BUILDKITE_COMMIT"
+      env:
+        DRA_WORKFLOW: snapshot

.buildkite/pipelines/intake.yml

@@ -93,13 +93,13 @@ steps:
       image: family/elasticsearch-ubuntu-2004
       machineType: custom-32-98304
       buildDirectory: /dev/shm/bk
-  # - wait
-  # - trigger: elasticsearch-dra-workflow
-  #   label: Trigger DRA snapshot workflow
-  #   async: true
-  #   branches: "main 9.* 8.* 7.17"
-  #   build:
-  #     branch: "$BUILDKITE_BRANCH"
-  #     commit: "$BUILDKITE_COMMIT"
-  #     env:
-  #       DRA_WORKFLOW: snapshot
+  - wait
+  - trigger: elasticsearch-dra-workflow
+    label: Trigger DRA snapshot workflow
+    async: true
+    branches: "main 9.* 8.* 7.17"
+    build:
+      branch: "$BUILDKITE_BRANCH"
+      commit: "$BUILDKITE_COMMIT"
+      env:
+        DRA_WORKFLOW: snapshot

.buildkite/pull-requests.json

@@ -2,7 +2,7 @@
   "jobs": [
     {
       "enabled": true,
-      "pipeline_slug": "elasticsearch-multi-project-pull-request",
+      "pipeline_slug": "elasticsearch-pull-request",
       "allow_org_users": true,
       "allowed_repo_permissions": [
         "admin",

catalog-info.yaml

@@ -123,7 +123,7 @@ spec:
       pipeline_file: .buildkite/pipelines/lucene-snapshot/build-snapshot.yml
       env:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
-        SLACK_NOTIFICATIONS_CHANNEL: "#lucene"
+        SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
         SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
       branch_configuration: lucene_snapshot
       default_branch: lucene_snapshot
@@ -167,9 +167,8 @@ spec:
       pipeline_file: .buildkite/pipelines/lucene-snapshot/update-branch.yml
       env:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
-        SLACK_NOTIFICATIONS_CHANNEL: "#lucene"
+        SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
         SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
-      branch_configuration: lucene_snapshot
       default_branch: lucene_snapshot
       teams:
         elasticsearch-team: {}
@@ -211,7 +210,7 @@ spec:
       pipeline_file: .buildkite/pipelines/lucene-snapshot/run-tests.yml
       env:
         ELASTIC_SLACK_NOTIFICATIONS_ENABLED: "true"
-        SLACK_NOTIFICATIONS_CHANNEL: "#lucene"
+        SLACK_NOTIFICATIONS_CHANNEL: "#lucene-ci"
         SLACK_NOTIFICATIONS_ALL_BRANCHES: "true"
       branch_configuration: lucene_snapshot
       default_branch: lucene_snapshot