X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=a221135c237b01e6c5da9dcc7e9306140b2896e2;hb=04ddcaa1631de196b5aac96215318d7dee70d0e1;hp=cc8726078d26fda2a05f2469c592d346c6b36665;hpb=8893827db2c2ecf7e3bf3ee47c6e1d3c2a9560c7;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index cc872607..a221135c 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}' @@ -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 # @@ -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}'