Fix signing pubkey declaration

[releng/global-jjb.git] / jjb / lf-release-jobs.yaml

diff --git a/jjb/lf-release-jobs.yaml b/jjb/lf-release-jobs.yaml
index 8563916..9f960a6 100644 (file)
--- a/jjb/lf-release-jobs.yaml
+++ b/jjb/lf-release-jobs.yaml
@@ -42,7 +42,7 @@
     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
@@ -64,7 +64,6 @@
     build-timeout: 15
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
-    project-pattern: "**"
     gerrit-skip-vote: false
 
     gerrit_verify_triggers:
@@ -92,6 +91,8 @@
               variable: SIGUL_PASSWORD
             - file-id: sigul-pki
               variable: SIGUL_PKI
+            - file-id: signing-pubkey
+              target: SIGNING_PUBKEY
       - shell: !include-raw-escape: ../shell/sigul-configuration.sh
       - shell: !include-raw-escape: ../shell/sigul-install.sh
       - lf-release
@@ -112,7 +113,7 @@
           submodule-recursive: false
           submodule-timeout: 10
           choosing-strategy: gerrit
-          jenkins-ssh-credential: "{jenkins-ssh-credential}"
+          jenkins-ssh-credential: "{jenkins-ssh-release-credential}"
 
     triggers:
       - gerrit:
@@ -120,7 +121,7 @@
           trigger-on: "{obj:gerrit_verify_triggers}"
           projects:
             - project-compare-type: "ANT"
-              project-pattern: "{project-pattern}"
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
                   branch-pattern: "**/master"
@@ -148,7 +149,6 @@
     build-timeout: 15
     disable-job: false
     git-url: "$GIT_URL/$PROJECT"
-    project-pattern: "**"
 
     gerrit_merge_triggers:
       - change-merged-event
@@ -171,6 +171,8 @@
               variable: SIGUL_PASSWORD
             - file-id: sigul-pki
               variable: SIGUL_PKI
+            - 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
@@ -184,7 +186,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"
@@ -199,7 +201,7 @@
           trigger-on: "{obj:gerrit_merge_triggers}"
           projects:
             - project-compare-type: "ANT"
-              project-pattern: "{project-pattern}"
+              project-pattern: "{project}"
               branches:
                 - branch-compare-type: "ANT"
                   branch-pattern: "**/master"