X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-release-jobs.yaml;h=29deacaf584283f7a374abfe746fb8ad3d690727;hb=9b6adc3de515a9388baad51acc33feb74a12d64a;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..29deacaf 100644
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -14,14 +14,6 @@
 - lf_release_common: &lf_release_common
     name: lf-release-common
 
-    ######################
-    # Default parameters #
-    ######################
-
-    gerrit_trigger_file_paths:
-      - compare-type: ANT
-        pattern: "releases/*.yaml"
-
     #####################
     # Job Configuration #
     #####################
@@ -36,13 +28,10 @@
     parameters:
       - lf-infra-parameters:
           project: "{project}"
-          branch: "master"
-          stream: "{stream}"
-
-    wrappers:
-      - lf-infra-wrappers:
-          build-timeout: "{build-timeout}"
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          branch: "$GERRIT_BRANCH"
+          stream: "$GERRIT_BRANCH"
+      - lf-build-with-parameters-maven-release:
+          use-release-file: "{use-release-file}"
 
     publishers:
       - lf-infra-publish
@@ -58,13 +47,12 @@
     # Default parameters #
     ######################
 
-    branch: master
-    stream: master
     build-days-to-keep: 7
     build-timeout: 15
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
     gerrit-skip-vote: false
+    use-release-file: true
 
     gerrit_verify_triggers:
       - patchset-created-event:
@@ -91,24 +79,29 @@
               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
     <<: *lf_release_verify
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+
     scm:
       - 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
@@ -124,8 +117,10 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**/master"
-              file-paths: "{obj:gerrit_trigger_file_paths}"
+                  branch-pattern: "**"
+              file-paths:
+                - compare-type: ANT
+                  pattern: "releases/*.yaml"
           skip-vote:
             successful: "{gerrit-skip-vote}"
             failed: "{gerrit-skip-vote}"
@@ -143,12 +138,11 @@
     # Default parameters #
     ######################
 
-    branch: master
-    stream: master
     build-days-to-keep: 7
     build-timeout: 15
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
+    use-release-file: true
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -171,19 +165,24 @@
               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
     <<: *lf_release_merge
 
+    wrappers:
+      - lf-infra-wrappers:
+          build-timeout: "{build-timeout}"
+          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
+
     scm:
       - lf-infra-gerrit-scm:
           jenkins-ssh-credential: "{jenkins-ssh-credential}"
@@ -204,5 +203,7 @@
               project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
-                  branch-pattern: "**/master"
-              file-paths: "{obj:gerrit_trigger_file_paths}"
+                  branch-pattern: "**"
+              file-paths:
+                - compare-type: ANT
+                  pattern: "releases/*.yaml"