Expose stream as a env variable

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

diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml
index f32547d..a221135 100644 (file)
--- 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}'
@@ -213,11 +216,11 @@
 
     properties:
       - github:
-          url: '${{GIT_URL}}{github-org}/{project}'
+          url: '{git-url}/{github-org}/{project}'
 
     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}'
@@ -244,7 +247,7 @@
     concurrent: true
     <<: *lf_jjb_verify_merge
     # yamllint disable-line rule:key-duplicates
-    <<: *lf_jjb_merge_builders
+    <<: *lf_jjb_verify_builders
 
     #####################
     # Job Configuration #
@@ -252,11 +255,11 @@
 
     properties:
       - github:
-          url: '${{GIT_URL}}{github-org}/{project}'
+          url: '{git-url}/{github-org}/{project}'
 
     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}'