X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=da8230fbe5e389f6e0e83c777765282bb838095b;hb=b262f61b380786d69b60c890c30eae1fe28ad227;hp=e32b1db4ddf32d3d1d1ca58592776c5c4359b79a;hpb=fda205d5688716c0c2a4f8ff334c77b36bf6dbe7;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index e32b1db4..da8230fb 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 @@ -207,23 +208,17 @@ # 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@github.com:{github-org}/{project}' + url: '{git-clone-url}{github-org}/{project}' refspec: '' branch: '{branch}' submodule-recursive: '{submodule-recursive}' @@ -247,15 +242,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 # @@ -263,11 +253,11 @@ properties: - github: - url: '{github-url}/{github-org}/{project}' + url: '{git-url}/{github-org}/{project}' scm: - lf-infra-github-scm: - url: 'git@github.com:{github-org}/{project}' + url: '{git-clone-url}{github-org}/{project}' refspec: '+refs/pull/*:refs/remotes/origin/pr/*' branch: '{branch}' submodule-recursive: '{submodule-recursive}'