X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=bce59853d6cea23712770fa417c63afdc99d92d7;hb=242c84d1804a9f1161dbd09d3c8147be1e6e7d99;hp=24a1e1581893c4ce1ca23314558783b6bddd22c9;hpb=a480891885b83c778dd82761eaa332cfc4d838f0;p=releng%2Fglobal-jjb.git

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index 24a1e158..bce59853 100644
--- a/jjb/lf-ci-jobs.yaml
+++ b/jjb/lf-ci-jobs.yaml
@@ -57,6 +57,7 @@
     builders:
       - lf-infra-jjbini
       - shell: !include-raw-escape:
+          - ../shell/git-validate-jira-urls.sh
           - ../shell/jjb-install.sh
           - ../shell/jjb-verify-job.sh
           - ../shell/jjb-check-unicode.sh
@@ -86,6 +87,7 @@
     # Default parameters #
     ######################
 
+    stream: master
     branch: master
     submodule-recursive: true
 
@@ -101,6 +103,7 @@
     parameters:
       - lf-infra-parameters:
           project: '{project}'
+          stream: '{stream}'
           branch: '{branch}'
       - lf-infra-jjb-parameters:
           jjb-version: '{jjb-version}'
@@ -217,7 +220,7 @@
 
     scm:
       - lf-infra-github-scm:
-          url: '${{GIT_CLONE_URL}}{github-org}/{project}'
+          url: '{git-clone-url}{github-org}/{project}'
           refspec: ''
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
@@ -228,15 +231,15 @@
       - github
       - pollscm:
           cron: ''
-      - github-pull-request:
+      - lf-infra-github-pr-trigger:
           trigger-phrase: '^remerge$'
           only-trigger-phrase: true
           status-context: 'JJB Merge'
           permit-all: false
           github-hooks: true
-          auto-close-on-fail: false
-          org-list:
-            - '{github-org}'
+          github-org: '{github-org}'
+          github_pr_whitelist: '{obj:github_pr_whitelist}'
+          github_pr_admin_list: '{obj:github_pr_admin_list}'
 
 - job-template:
     name: '{project-name}-jjb-verify'
@@ -256,7 +259,7 @@
 
     scm:
       - lf-infra-github-scm:
-          url: '${{GIT_CLONE_URL}}{github-org}/{project}'
+          url: '{git-clone-url}{github-org}/{project}'
           refspec: '+refs/pull/*:refs/remotes/origin/pr/*'
           branch: '{branch}'
           submodule-recursive: '{submodule-recursive}'
@@ -264,10 +267,14 @@
           jenkins-ssh-credential: '{jenkins-ssh-credential}'
 
     triggers:
-      - github-pull-request:
+      - lf-infra-github-pr-trigger:
           trigger-phrase: '^recheck$'
           only-trigger-phrase: false
           status-context: 'JJB Verify'
           permit-all: true
           github-hooks: true
-          auto-close-on-fail: false
+          github-org: ''
+          github_pr_whitelist:
+            - ''
+          github_pr_admin_list:
+            - ''