Issue: RELENG-4782
Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>
Change-Id: Ib319f90e5e1b64b837588f46314766e55431e4fb
commit with the release yaml file, not the tip of the target branch, so
projects can repeat the release action in case of merge job failure.
commit with the release yaml file, not the tip of the target branch, so
projects can repeat the release action in case of merge job failure.
-:Template Name: {project-name}-release-merge
+:Template Name: {project-name}-release-merge-{stream}
:Comment Trigger: remerge
:Comment Trigger: remerge
:build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
:build-timeout: Timeout in minutes before aborting build. (default: 15)
:build-days-to-keep: Days to keep build logs in Jenkins. (default: 7)
:build-timeout: Timeout in minutes before aborting build. (default: 15)
+ :stream: Keyword that represents a release code-name.
+ Often the same as the branch. (default: master)
:gerrit_merge_triggers: Override Gerrit Triggers.
:gerrit_trigger_file_paths: Override file paths filter which checks which
:gerrit_merge_triggers: Override Gerrit Triggers.
:gerrit_trigger_file_paths: Override file paths filter which checks which
This template supports Maven and Container release jobs.
This template supports Maven and Container release jobs.
-:Template Name: {project-name}-release-verify
+:Template Name: {project-name}-release-verify-{stream}
:Comment Trigger: recheck|reverify
:Comment Trigger: recheck|reverify
:build-timeout: Timeout in minutes before aborting build. (default: 15)
:gerrit-skip-vote: Skip voting for this job. (default: false)
:git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
:build-timeout: Timeout in minutes before aborting build. (default: 15)
:gerrit-skip-vote: Skip voting for this job. (default: false)
:git-url: URL clone project from. (default: $GIT_URL/$PROJECT)
+ :stream: Keyword that represents a release code-name.
+ Often the same as the branch. (default: master)
:gerrit_verify_triggers: Override Gerrit Triggers.
:gerrit_trigger_file_paths: Override file paths filter which checks which
:gerrit_verify_triggers: Override Gerrit Triggers.
:gerrit_trigger_file_paths: Override file paths filter which checks which
disable-job: false
git-url: "$GIT_URL/$PROJECT"
gerrit-skip-vote: false
disable-job: false
git-url: "$GIT_URL/$PROJECT"
gerrit-skip-vote: false
use-release-file: true
gerrit_verify_triggers:
use-release-file: true
gerrit_verify_triggers:
- lf-release
- job-template:
- lf-release
- job-template:
- name: "{project-name}-release-verify"
+ name: "{project-name}-release-verify-{stream}"
id: gerrit-release-verify
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
id: gerrit-release-verify
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
notbuilt: "{gerrit-skip-vote}"
- job-template:
notbuilt: "{gerrit-skip-vote}"
- job-template:
- name: "{project-name}-release-verify"
+ name: "{project-name}-release-verify-{stream}"
id: github-release-verify
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
id: github-release-verify
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
build-timeout: 15
disable-job: false
git-url: "$GIT_URL/$PROJECT"
build-timeout: 15
disable-job: false
git-url: "$GIT_URL/$PROJECT"
use-release-file: true
gerrit_merge_triggers:
use-release-file: true
gerrit_merge_triggers:
- lf-release
- job-template:
- lf-release
- job-template:
- name: "{project-name}-release-merge"
+ name: "{project-name}-release-merge-{stream}"
id: gerrit-release-merge
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
id: gerrit-release-merge
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
- job-template:
pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
- job-template:
- name: "{project-name}-release-merge"
+ name: "{project-name}-release-merge-{stream}"
id: github-release-merge
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
id: github-release-merge
<<: *lf_release_common
# yamllint disable-line rule:key-duplicates
--- /dev/null
+---
+fixes:
+ - |
+ Gerrit release verify and merge jobs need to have a {stream} variable in
+ their name to allow the creation of the same job under different branches
+ without conflicting.