Update DRA release job triggers

.ci/jobs.t/elastic+elasticsearch+periodic+dra-snapshots.yml → .ci/jobs.t/elastic+elasticsearch+dra-snapshot.yml

@@ -1,7 +1,7 @@
 ---
 - job:
-    name: elastic+elasticsearch+%BRANCH%+periodic+dra-snapshot
-    workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+periodic+dra-snapshot
+    name: elastic+elasticsearch+%BRANCH%+dra-snapshot
+    workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+dra-snapshot
     display-name: "elastic / elasticsearch # %BRANCH% - DRA snapshot"
     description: "Publishing Daily Releasable Artifacts (DRAs) of Elasticsearch %BRANCH% snapshots.\n"
     node: "ubuntu-20.04"

.ci/jobs.t/elastic+elasticsearch+periodic+dra-snapshots-trigger.yml → .ci/jobs.t/elastic+elasticsearch+dra-staging-trigger.yml

@@ -1,6 +1,6 @@
 ---
 jjbb-template: periodic-trigger-lgc.yml
 vars:
-  - periodic-job: elastic+elasticsearch+%BRANCH%+periodic+dra-snapshot
+  - periodic-job: elastic+elasticsearch+%BRANCH%+dra-staging
   - lgc-job: elastic+elasticsearch+%BRANCH%+intake
   - cron: "H H/12 * * *"

.ci/jobs.t/elastic+elasticsearch+dra-staging.yml

@@ -1,6 +1,6 @@
 ---
 - job:
-    name: elastic+elasticsearch+%BRANCH%+dra-snapshot
+    name: elastic+elasticsearch+%BRANCH%+dra-staging
     workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+dra-staging
     display-name: "elastic / elasticsearch # %BRANCH% - DRA staging"
     description: "Publishing Daily Releasable Artifacts (DRAs) of Elasticsearch %BRANCH% staging.\n"
@@ -13,6 +13,12 @@
             RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
       - shell: |
             #!/usr/local/bin/runbld --redirect-stderr
+
+            # Don't publish main branch to staging
+            if [ "%BRANCH%" == "main" ]; then
+              exit 0
+            fi
+
             WORKFLOW="staging"
             RM_BRANCH="%BRANCH%" && [[ "%BRANCH%" == "main" ]] && RM_BRANCH=master
             ES_VERSION=$(cat build-tools-internal/version.properties \

.ci/jobs.t/elastic+elasticsearch+intake.yml

@@ -54,6 +54,13 @@
               kill-phase-on: NEVER
               current-parameters: true
               git-revision: true
+      - multijob:
+          name: Publish snapshot artifacts
+          projects:
+            - name: elastic+elasticsearch+%BRANCH%+dra-snapshot
+              kill-phase-on: NEVER
+              current-parameters: true
+              git-revision: true
       - multijob:
           name: Update last good commit
           projects: