X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=00acc009ffe7b278a42b845e59d5a8f1b397219e;hb=2e268da8dd4f10cc6a712c41d8e18c5c1ff0d860;hp=02111ef754884db142c6bf4800eca34438aed5fc;hpb=729b2e3535f009a146719df7d7b52e036b2505cb;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 02111ef7..00acc009 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -36,13 +36,13 @@
     parameters:
       - lf-infra-parameters:
           project: "{project}"
-          branch: "master"
-          stream: "{stream}"
+          branch: "$GERRIT_BRANCH"
+          stream: "$GERRIT_BRANCH"
 
     wrappers:
       - lf-infra-wrappers:
           build-timeout: "{build-timeout}"
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
 
     publishers:
       - lf-infra-publish
@@ -58,8 +58,6 @@
     # Default parameters #
     ######################
 
-    branch: master
-    stream: master
     build-days-to-keep: 7
     build-timeout: 15
     disable-job: false
@@ -91,14 +89,14 @@
               variable: SIGUL_PASSWORD
             - file-id: sigul-pki
               variable: SIGUL_PKI
-            - file-id: onap-pubkey
-              target: "/tmp/onap-pubkey"
+            - file-id: signing-pubkey
+              variable: SIGNING_PUBKEY
       - shell: !include-raw-escape: ../shell/sigul-configuration.sh
       - shell: !include-raw-escape: ../shell/sigul-install.sh
       - lf-release
 
 - job-template:
-    name: "{project-name}-release-verify-{stream}"
+    name: "{project-name}-release-verify"
     id: gerrit-release-verify
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
@@ -108,12 +106,12 @@
       - lf-infra-gerrit-scm:
           git-url: "{git-url}"
           refspec: "$GERRIT_REFSPEC"
-          branch: "master"
+          branch: "$GERRIT_BRANCH"
           submodule-disable: true
           submodule-recursive: false
           submodule-timeout: 10
           choosing-strategy: gerrit
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
 
     triggers:
       - gerrit:
@@ -124,7 +122,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**/master"
+                  branch-pattern: "**"
               file-paths: "{obj:gerrit_trigger_file_paths}"
           skip-vote:
             successful: "{gerrit-skip-vote}"
@@ -143,8 +141,6 @@
     # Default parameters #
     ######################
 
-    branch: master
-    stream: master
     build-days-to-keep: 7
     build-timeout: 15
     disable-job: false
@@ -171,14 +167,14 @@
               variable: SIGUL_PASSWORD
             - file-id: sigul-pki
               variable: SIGUL_PKI
-            - file-id: onap-pubkey
-              target: "/tmp/onap-pubkey"
+            - file-id: signing-pubkey
+              variable: SIGNING_PUBKEY
       - shell: !include-raw-escape: ../shell/sigul-configuration.sh
       - shell: !include-raw-escape: ../shell/sigul-install.sh
       - lf-release
 
 - job-template:
-    name: "{project-name}-release-merge-{stream}"
+    name: "{project-name}-release-merge"
     id: gerrit-release-merge
     <<: *lf_release_common
     # yamllint disable-line rule:key-duplicates
@@ -186,7 +182,7 @@
 
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
           git-url: "{git-url}"
           refspec: "$GERRIT_REFSPEC"
           branch: "$GERRIT_BRANCH"
@@ -204,5 +200,5 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**/master"
+                  branch-pattern: "**"
               file-paths: "{obj:gerrit_trigger_file_paths}"