X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;h=5655a2b5c52cf7c6d49ef9e107c5a1002e1a3f39;hb=0b1d0ba4945b93dc5d86fffef20f4be44fc5a2f9;hp=558d385828e553612d4da5561f3ee79a60bd80dc;hpb=2ea5908d7197fd2a895e1992920db2d7cfdf64d7;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 558d3858..5655a2b5 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -20,7 +20,7 @@ - job-group: name: '{project-name}-packer-jobs' - packer-version: 1.1.3 + packer-version: 1.2.2 jobs: - gerrit-packer-merge @@ -30,7 +30,7 @@ - job-group: name: '{project-name}-github-packer-jobs' - packer-version: 1.1.3 + packer-version: 1.2.2 jobs: - github-packer-merge @@ -141,7 +141,7 @@ branch: master build-timeout: 10 - jjb-version: 1.6.2 + jjb-version: 2.0.5 stream: master submodule-recursive: true @@ -256,6 +256,15 @@ # Jenkins Configuration Management Merge # ########################################## +- builder: + name: lf-jenkins-cfg-clouds + builders: + - lf-infra-jjbini + - inject: + properties-content: 'jenkins_silos={jenkins-silos}' + - shell: !include-raw-escape: ../shell/jenkins-configure-clouds.sh + - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini" + - builder: name: lf-jenkins-cfg-global-vars builders: @@ -316,6 +325,8 @@ - ../shell/lftools-install.sh - lf-jenkins-cfg-global-vars: jenkins-silos: '{jenkins-silos}' + - lf-jenkins-cfg-clouds: + jenkins-silos: '{jenkins-silos}' publishers: - lf-infra-publish