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=f8b7b775b8f690b400886d5cd5c48c84e8397d4d;hb=11bccd3d96d180f93ae96cd330e23565ba351aa5;hp=e9e483ea70f65e7e8fbfa5cb11e1d9487fa8535f;hpb=a9a25596239cc8b5fd374cf742764fe5a9c2a3d7;p=releng%2Fglobal-jjb.git diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index e9e483ea..f8b7b775 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -236,7 +236,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 @@ -245,7 +245,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 @@ -301,8 +301,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: @@ -572,6 +571,7 @@ ##################### builders: + - lf-infra-pre-build - lf-infra-jjbini - shell: !include-raw-escape: - ../shell/jjb-install.sh @@ -680,6 +680,7 @@ concurrent: true builders: + - lf-infra-pre-build - lf-infra-jjbini - shell: !include-raw-escape: - ../shell/git-validate-jira-urls.sh