X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=24a1e1581893c4ce1ca23314558783b6bddd22c9;hb=a480891885b83c778dd82761eaa332cfc4d838f0;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..24a1e158 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}'
@@ -185,30 +207,27 @@
     # yamllint disable-line rule:key-duplicates
     <<: *lf_jjb_merge_builders
 
-    ######################
-    # Default parameters #
-    ######################
-
-    github-url: https://github.com
-
     #####################
     # Job Configuration #
     #####################
 
     properties:
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: '{git-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
-          url: '$GIT_URL/$PROJECT'
-          refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
+          url: '${{GIT_CLONE_URL}}{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
@@ -222,15 +241,10 @@
 - job-template:
     name: '{project-name}-jjb-verify'
     id: github-jjb-verify
+    concurrent: true
     <<: *lf_jjb_verify_merge
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_jjb_merge_builders
-
-    ######################
-    # Default parameters #
-    ######################
-
-    github-url: https://github.com
+    <<: *lf_jjb_verify_builders
 
     #####################
     # Job Configuration #
@@ -238,11 +252,11 @@
 
     properties:
       - github:
-          url: '{github-url}/{github-org}/{project}'
+          url: '{git-url}/{github-org}/{project}'
 
     scm:
       - lf-infra-github-scm:
-          url: '$GIT_URL/$PROJECT'
+          url: '${{GIT_CLONE_URL}}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'