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

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index e1bf0684..229b86e8 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
@@ -131,7 +132,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/.*\.yaml|\.releases\/.*\.yaml)'
@@ -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
 
     ######################
@@ -194,8 +195,11 @@
 
     build-days-to-keep: 7
     build-timeout: 15
+    cosign-password-id: cosign-password
+    cosign-private-key-id: cosign-private-key
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
+    stream: master
     use-release-file: true
 
     gerrit_merge_triggers:
@@ -257,7 +261,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
@@ -267,6 +271,13 @@
       - lf-infra-wrappers:
           build-timeout: "{build-timeout}"
           jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+      - credentials-binding:
+          - file:
+              credential-id: "{cosign-private-key-id}"
+              variable: COSIGN_PRIVATE_KEY
+          - text:
+              credential-id: "{cosign-password-id}"
+              variable: COSIGN_PASSWORD
 
     scm:
       - lf-infra-gerrit-scm:
@@ -289,13 +300,13 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   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
@@ -311,6 +322,13 @@
       - lf-infra-wrappers:
           build-timeout: "{build-timeout}"
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
+      - credentials-binding:
+          - file:
+              credential-id: "{cosign-private-key-id}"
+              variable: COSIGN_PRIVATE_KEY
+          - text:
+              credential-id: "{cosign-password-id}"
+              variable: COSIGN_PASSWORD
 
     scm:
       - lf-infra-github-scm:
@@ -338,7 +356,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 +364,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 +372,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
 
     ######################
@@ -484,7 +502,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
@@ -555,7 +573,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: ANT
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths: "{obj:gerrit_release_trigger_file_paths}"
 
 - job-template:
@@ -595,7 +613,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 +626,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 #
@@ -700,7 +718,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)'
@@ -745,7 +763,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**"
+                  branch-pattern: "**/{branch}"
               file-paths:
                 - compare-type: REG_EXP
                   pattern: '(releases\/packagecloud.*\.yaml|\.releases\/packagecloud.*\.yaml)'