X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=d7361595fc5b208ee1ad9bb5354f42be5c3faab5;hb=refs%2Ftags%2Fv0.88.2;hp=e1bf068471f02fa6d3c0e5273bff9369d7865680;hpb=3b887734bb2bc6cf09b29cd39e6d99706ef57531;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index e1bf0684..d7361595 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -11,7 +11,7 @@
 # COMMON FUNCTIONS #
 ####################
 
-- lf_release_common: &lf_release_common
+- _lf_release_common: &lf_release_common
     name: lf-release-common
 
     #####################
@@ -32,7 +32,7 @@
 # RELEASE VERIFY #
 ##################
 
-- lf_release_verify: &lf_release_verify
+- _lf_release_verify: &lf_release_verify
     name: lf-release-verify
 
     ######################
@@ -44,6 +44,7 @@
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     gerrit-skip-vote: false
+    stream: master
     use-release-file: true
 
     gerrit_verify_triggers:
@@ -100,7 +101,7 @@
       - 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
@@ -142,7 +143,7 @@
             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
@@ -185,7 +186,7 @@
 # RELEASE MERGE #
 #################
 
-- lf_release_merge: &lf_release_merge
+- _lf_release_merge: &lf_release_merge
     name: lf-release-merge
 
     ######################
@@ -196,6 +197,7 @@
     build-timeout: 15
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
+    stream: master
     use-release-file: true
 
     gerrit_merge_triggers:
@@ -257,7 +259,7 @@
       - 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
@@ -295,7 +297,7 @@
                   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
@@ -338,7 +340,7 @@
 # PyPI RELEASE #
 ################
 
-- lf_pypi_verify_wrappers: &lf_pypi_verify_wrappers
+- _lf_pypi_verify_wrappers: &lf_pypi_verify_wrappers
     name: lf-pypi-verify-wrappers
 
     wrappers:
@@ -346,7 +348,7 @@
           build-timeout: "{build-timeout}"
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
 
-- lf_pypi_release_wrappers: &lf_pypi_release_wrappers
+- _lf_pypi_release_wrappers: &lf_pypi_release_wrappers
     name: lf-pypi-release-wrappers
 
     wrappers:
@@ -354,7 +356,7 @@
           build-timeout: "{build-timeout}"
           jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
 
-- lf_pypi_release: &lf_pypi_release
+- _lf_pypi_release: &lf_pypi_release
     name: lf-pypi-release
 
     ######################
@@ -595,7 +597,7 @@
 # PackageCloud RELEASE #
 ########################
 
-- lf_packagecloud_release_common: &lf_packagecloud_release_common
+- _lf_packagecloud_release_common: &lf_packagecloud_release_common
     name: lf-packagecloud-release-common
 
     ######################
@@ -608,8 +610,8 @@
     git-url: "$GIT_URL/$PROJECT"
     gerrit-skip-vote: false
     use-release-file: true
-    account-name: "{account-name}"
-    source-repo: "{source-repo}"
+    account-name: ""
+    source-repo: ""
 
     #####################
     # Job Configuration #