X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=docs%2Fjjb%2Flf-release-jobs.rst;h=8a1142e1f5cbf07c41ee44c3c48a502d0d37668c;hb=4f710879178e99418a84987cde1f2255aa1f17c5;hp=98bc15378dbf8b8ca291c7b48d714e883d44e29d;hpb=29b855c488894cf4beea3e0c809bc544b1b4a352;p=releng%2Fglobal-jjb.git diff --git a/docs/jjb/lf-release-jobs.rst b/docs/jjb/lf-release-jobs.rst index 98bc1537..8a1142e1 100644 --- a/docs/jjb/lf-release-jobs.rst +++ b/docs/jjb/lf-release-jobs.rst @@ -305,7 +305,7 @@ This template uses a git commit choosing strategy that builds the merged 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 @@ -321,6 +321,8 @@ projects can repeat the release action in case of merge job failure. :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 @@ -333,7 +335,7 @@ Release Verify 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 @@ -352,6 +354,8 @@ This template supports Maven and Container release jobs. :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