Skip to content

Commit dcc1b3a

Browse files
committed
Update DRA release job triggers
1 parent aa33a7a commit dcc1b3a

4 files changed

+17
-4
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
- job:
3-
name: elastic+elasticsearch+%BRANCH%+periodic+dra-snapshot
4-
workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+periodic+dra-snapshot
3+
name: elastic+elasticsearch+%BRANCH%+dra-snapshot
4+
workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+dra-snapshot
55
display-name: "elastic / elasticsearch # %BRANCH% - DRA snapshot"
66
description: "Publishing Daily Releasable Artifacts (DRAs) of Elasticsearch %BRANCH% snapshots.\n"
77
node: "ubuntu-20.04"
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
jjbb-template: periodic-trigger-lgc.yml
33
vars:
4-
- periodic-job: elastic+elasticsearch+%BRANCH%+periodic+dra-snapshot
4+
- periodic-job: elastic+elasticsearch+%BRANCH%+dra-staging
55
- lgc-job: elastic+elasticsearch+%BRANCH%+intake
66
- cron: "H H/12 * * *"

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

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
---
22
- job:
3-
name: elastic+elasticsearch+%BRANCH%+dra-snapshot
3+
name: elastic+elasticsearch+%BRANCH%+dra-staging
44
workspace: /dev/shm/elastic+elasticsearch+%BRANCH%+dra-staging
55
display-name: "elastic / elasticsearch # %BRANCH% - DRA staging"
66
description: "Publishing Daily Releasable Artifacts (DRAs) of Elasticsearch %BRANCH% staging.\n"
@@ -13,6 +13,12 @@
1313
RUNTIME_JAVA_HOME=$HOME/.java/$ES_RUNTIME_JAVA
1414
- shell: |
1515
#!/usr/local/bin/runbld --redirect-stderr
16+
17+
# Don't publish main branch to staging
18+
if [ "%BRANCH%" == "main" ]; then
19+
exit 0
20+
fi
21+
1622
WORKFLOW="staging"
1723
RM_BRANCH="%BRANCH%" && [[ "%BRANCH%" == "main" ]] && RM_BRANCH=master
1824
ES_VERSION=$(cat build-tools-internal/version.properties \

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,13 @@
4646
kill-phase-on: NEVER
4747
current-parameters: true
4848
git-revision: true
49+
- multijob:
50+
name: Publish snapshot artifacts
51+
projects:
52+
- name: elastic+elasticsearch+%BRANCH%+dra-snapshot
53+
kill-phase-on: NEVER
54+
current-parameters: true
55+
git-revision: true
4956
- multijob:
5057
name: Update last good commit
5158
projects:

0 commit comments

Comments
 (0)