X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=bdebb0f50e6ebbe1145a1df3d87d4114afb5b829;hb=ff69c5d06f4d27f3784bd56c6006e380c95f797f;hp=8a49d0368e295cda6416ce71b69f542dce78d96b;hpb=d7ab98245ca71895ab0fce4cf23c41a888a1e7f3;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 8a49d036..bdebb0f5 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -484,11 +484,11 @@ scm: - lf-infra-gerrit-scm: git-url: '{git-url}' - refspec: 'refs/heads/{branch}' - branch: '{branch}' + refspec: '$GERRIT_REFSPEC' + branch: '$GERRIT_BRANCH' submodule-recursive: true submodule-timeout: '{submodule-timeout}' - choosing-strategy: default + choosing-strategy: gerrit jenkins-ssh-credential: '{jenkins-ssh-credential}' triggers: @@ -719,6 +719,8 @@ # Default parameters # ###################### + jjb-workers: 0 + gerrit_merge_triggers: - change-merged-event - comment-added-contains-event: @@ -731,6 +733,8 @@ builders: - lf-infra-pre-build - lf-infra-jjbini + - inject: + properties-content: JJB_WORKERS={jjb-workers} - shell: !include-raw-escape: - ../shell/jjb-install.sh - ../shell/jjb-merge-job.sh