X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=blobdiff_plain;f=jjb%2Flf-ci-jobs.yaml;fp=jjb%2Flf-ci-jobs.yaml;h=5b18b1d9379134196adedd5f18df3989bec472b8;hb=fc8ed70c43a44aaa3a68f48222a69041d137c912;hp=61f37fee0be4b8b97c09fbe27bd20859aeebe7db;hpb=7265d1f18e9895a1d86449c3ee9fa57edd023df9;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index 61f37fee..5b18b1d9 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -281,7 +281,7 @@ - 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" + - shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini" - builder: name: lf-jenkins-cfg-global-vars @@ -290,7 +290,7 @@ - inject: properties-content: 'jenkins_silos={jenkins-silos}' - shell: !include-raw-escape: ../shell/jenkins-configure-global-vars.sh - - shell: rm "$HOME/.config/jenkins_jobs/jenkins_jobs.ini" + - shell: rm -f "$HOME/.config/jenkins_jobs/jenkins_jobs.ini" - lf_jenkins_configuration: &lf_jenkins_cfg_merge name: lf-jenkins-cfg-merge @@ -346,8 +346,7 @@ jenkins-ssh-credential: '{jenkins-ssh-credential}' builders: - - shell: !include-raw-escape: - - ../shell/lftools-install.sh + - lf-infra-pre-build - lf-jenkins-cfg-global-vars: jenkins-silos: '{jenkins-silos}' - lf-jenkins-cfg-clouds: