diff options
| author |   Aric Gardner <agardner@linuxfoundation.org> | 2018-09-20 13:50:02 -0400 |
|---|---|---|
| committer | Aric Gardner <agardner@linuxfoundation.org> | 2018-11-23 15:21:24 -0500 |
| commit | 52d29ad095ad729a0287ec07a2c19072b4fb672b (patch) | |
| tree | 912efab92e18a2fe3b0cd874c9a4b5adeda7b681 /jjb/releng/releng-release-jobs.yaml | |
| parent | 1569d338abfadc2a851e7f842c3fcc22e2d7998d (diff) | |
Rework creating tags & branches from release files
Old method could not properly handle both branching and
tagging on changes to the release file.
Proposed method:
jjb calls:
jjb/releng/branch-or-tag.sh
for both verify and merge jobs.
branch-or-tag determins nature of the change to
"releases/branch/project.yaml"
and calls
releng-release-tagging.sh
or
releng-release-create-branch.sh
The scripts above handle both verify and merge operations
based on
if [[ $TAG_EXISTS = false && "$JOB_NAME" =~ "merge" ]];
and
if [[ $REF_EXISTS = true && "$JOB_NAME" =~ "merge" ]]; then
both scripts check that the ref exits in verfiy and merge stages.
if releng-release-create-branch.sh creates a branch it then also
calls releases/scripts/create_jobs.py
Change-Id: Ieb99de5e4df100af59ecc818f52b0831383b2b62
Signed-off-by: Aric Gardner <agardner@linuxfoundation.org>
Diffstat (limited to 'jjb/releng/releng-release-jobs.yaml')
| -rw-r--r-- | jjb/releng/releng-release-jobs.yaml | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/jjb/releng/releng-release-jobs.yaml b/jjb/releng/releng-release-jobs.yaml index 3136d7855..d79771fea 100644 --- a/jjb/releng/releng-release-jobs.yaml +++ b/jjb/releng/releng-release-jobs.yaml @@ -66,7 +66,7 @@ builders: - shell: !include-raw-escape: - releng-release-create-venv.sh - - releng-release-tagging.sh + - branch-or-tag.sh publishers: - email-jenkins-admins-on-failure @@ -106,8 +106,7 @@ builders: - shell: !include-raw-escape: - releng-release-create-venv.sh - - releng-release-tagging.sh - - releng-release-create-branch.sh + - branch-or-tag.sh publishers: - email-jenkins-admins-on-failure |