X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=e32b1db4ddf32d3d1d1ca58592776c5c4359b79a;hb=c887df2200ea8a7a58e0aeb538affd0c93a48dfc;hp=b1d3646b84f9f537bc5ef9660c65bc534b0a163e;hpb=0912741cdcac047d4ef2e0d689a0260debc92b32;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index b1d3646b..e32b1db4 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -60,7 +60,7 @@
           - ../shell/jjb-install.sh
           - ../shell/jjb-verify-job.sh
           - ../shell/jjb-check-unicode.sh
-      - gpg-verify-git-signature
+      - lf-infra-gpg-verify-git-signature
 
 - parameter:
     name: lf-infra-jjb-parameters
@@ -120,13 +120,24 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_merge_builders
 
+    ######################
+    # Default parameters #
+    ######################
+
+    git-url: '$GIT_URL/$GERRIT_PROJECT'
+
+    #####################
+    # Job Configuration #
+    #####################
+
     scm:
       - lf-infra-gerrit-scm:
-          jenkins-ssh-credential: '{jenkins-ssh-credential}'
+          git-url: '{git-url}'
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
+          jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
       - gerrit:
@@ -151,8 +162,19 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_verify_builders
 
+    ######################
+    # Default parameters #
+    ######################
+
+    git-url: '$GIT_URL/$GERRIT_PROJECT'
+
+    #####################
+    # Job Configuration #
+    #####################
+
     scm:
       - lf-infra-gerrit-scm:
+          git-url: '{git-url}'
           refspec: '$GERRIT_REFSPEC'
           branch: '$GERRIT_BRANCH'
           submodule-recursive: '{submodule-recursive}'
@@ -201,14 +223,17 @@
 
     scm:
       - lf-infra-github-scm:
-          url: '$GIT_URL/$PROJECT'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
+          url: 'git@github.com:{github-org}/{project}'
+          refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
           choosing-strategy: default
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
+      - github
+      - pollscm:
+          cron: ''
       - github-pull-request:
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
@@ -242,7 +267,7 @@
 
     scm:
       - lf-infra-github-scm:
-          url: '$GIT_URL/$PROJECT'
+          url: 'git@github.com:{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'