From: Thanh Ha Date: Fri, 14 Sep 2018 01:29:58 +0000 (-0400) Subject: Update jenkins-cfg job to use lf-infra-pre-build X-Git-Tag: v0.24.3^0 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F97%2F12597%2F1;p=releng%2Fglobal-jjb.git Update jenkins-cfg job to use lf-infra-pre-build Use lf-infra-pre-build to install lftools via --user config. This resolves the post-build install failing with missing pip==18.0. This is related to the lftools-venv series of patches. Change-Id: I486e436a640192dabe261e901024b42170e416cc Signed-off-by: Thanh Ha --- 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: diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh index 070a94e7..df1b598f 100644 --- a/shell/jenkins-configure-clouds.sh +++ b/shell/jenkins-configure-clouds.sh @@ -36,9 +36,6 @@ if [ ! -d "$WORKSPACE/jenkins-config/clouds" ]; then exit 0 fi -#shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091 -source "/tmp/v/lftools/bin/activate" - GROOVY_SCRIPT_FILE="jjb/global-jjb/jenkins-admin/manage_clouds.groovy" OS_CLOUD_DIR="$WORKSPACE/jenkins-config/clouds/openstack" SCRIPT_DIR="$WORKSPACE/archives/groovy-inserts" diff --git a/shell/jenkins-configure-global-vars.sh b/shell/jenkins-configure-global-vars.sh index de45f907..2ebdceea 100644 --- a/shell/jenkins-configure-global-vars.sh +++ b/shell/jenkins-configure-global-vars.sh @@ -20,8 +20,6 @@ echo "---> jenkins-configure-global-vars.sh" GROOVY_SCRIPT_FILE="jjb/global-jjb/jenkins-admin/set_global_properties.groovy" -# shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091 -source "/tmp/v/lftools/bin/activate" silos="${jenkins_silos:-jenkins}" set -eu -o pipefail