From 76f492c41f20bc7bf634f3c40cb19cd4e26a54ed Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Fri, 21 Sep 2018 19:41:20 -0400 Subject: [PATCH] Fix jenkins-init scripts dir Resolve issue caused by I5060dd0c1b67fa020a84844936eebb970ae2cbb6 which moved the global-jjb directory around and caused scripts that depended on the old path to start failing. Change-Id: I705a8c79bd69c9fdaff8dc677e0f22cb6b42d74b Signed-off-by: Thanh Ha --- docs/install.rst | 2 -- jenkins-init-scripts/init.sh | 2 +- jjb/lf-ci-jobs.yaml | 2 +- .../notes/fix-jenkins-init-scripts-dir-a448c059855bda50.yaml | 6 ++++++ shell/jenkins-configure-clouds.sh | 4 ++-- shell/jenkins-configure-global-vars.sh | 2 +- 6 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 releasenotes/notes/fix-jenkins-init-scripts-dir-a448c059855bda50.yaml diff --git a/docs/install.rst b/docs/install.rst index 49bc0413..6a9c1366 100644 --- a/docs/install.rst +++ b/docs/install.rst @@ -114,8 +114,6 @@ Global JJB as follows: mkdir jjb/global-jjb ln -s ../../global-jjb/shell jjb/global-jjb/shell ln -s ../../global-jjb/jjb jjb/global-jjb/jjb - ln -s ../../global-jjb/jenkins-admin jjb/global-jjb/jenkins-admin - ln -s ../../global-jjb/jenkins-init-scripts jjb/global-jjb/jenkins-init-scripts git add jjb/global-jjb git commit -sm "Install global-jjb $GLOBAL_JJB_VERSION" diff --git a/jenkins-init-scripts/init.sh b/jenkins-init-scripts/init.sh index 3ddcc6fe..1bd2229e 100755 --- a/jenkins-init-scripts/init.sh +++ b/jenkins-init-scripts/init.sh @@ -9,7 +9,7 @@ # http://www.eclipse.org/legal/epl-v10.html ############################################################################## -INIT_SCRIPTS_DIR="/opt/ciman/jjb/global-jjb/jenkins-init-scripts" +INIT_SCRIPTS_DIR="/opt/ciman/global-jjb/jenkins-init-scripts" "$INIT_SCRIPTS_DIR/package-listing.sh" "$INIT_SCRIPTS_DIR/basic-settings.sh" diff --git a/jjb/lf-ci-jobs.yaml b/jjb/lf-ci-jobs.yaml index f074bacc..a3893e18 100644 --- a/jjb/lf-ci-jobs.yaml +++ b/jjb/lf-ci-jobs.yaml @@ -772,7 +772,7 @@ builders: - shell: | - cd jjb/global-jjb + cd global-jjb git fetch https://gerrit.linuxfoundation.org/infra/releng/global-jjb $GERRIT_REFSPEC git cherry-pick FETCH_HEAD - lf-infra-jjbini diff --git a/releasenotes/notes/fix-jenkins-init-scripts-dir-a448c059855bda50.yaml b/releasenotes/notes/fix-jenkins-init-scripts-dir-a448c059855bda50.yaml new file mode 100644 index 00000000..4f2accb7 --- /dev/null +++ b/releasenotes/notes/fix-jenkins-init-scripts-dir-a448c059855bda50.yaml @@ -0,0 +1,6 @@ +--- +fixes: + - | + The jenkins-init scripts dir is now updated to reflect changes recommended + for the v0.25.0 release. We unfortunately missed this critical piece in the + v0.25.0 release. diff --git a/shell/jenkins-configure-clouds.sh b/shell/jenkins-configure-clouds.sh index ed72f745..59c80a0d 100644 --- a/shell/jenkins-configure-clouds.sh +++ b/shell/jenkins-configure-clouds.sh @@ -28,7 +28,7 @@ # # export WORKSPACE=/tmp/ci-management # export jenkins_silos=sandbox -# bash ./jjb/global-jjb/shell/jenkins-configure-clouds.sh +# bash ./global-jjb/shell/jenkins-configure-clouds.sh echo "---> jenkins-configure-clouds.sh" if [ ! -d "$WORKSPACE/jenkins-config/clouds" ]; then @@ -36,7 +36,7 @@ if [ ! -d "$WORKSPACE/jenkins-config/clouds" ]; then exit 0 fi -GROOVY_SCRIPT_FILE="jjb/global-jjb/jenkins-admin/manage_clouds.groovy" +GROOVY_SCRIPT_FILE="global-jjb/jenkins-admin/manage_clouds.groovy" OS_CLOUD_DIR="$WORKSPACE/jenkins-config/clouds/openstack" SCRIPT_DIR="$WORKSPACE/archives/groovy-inserts" mkdir -p "$SCRIPT_DIR" diff --git a/shell/jenkins-configure-global-vars.sh b/shell/jenkins-configure-global-vars.sh index 2ebdceea..eb25de0a 100644 --- a/shell/jenkins-configure-global-vars.sh +++ b/shell/jenkins-configure-global-vars.sh @@ -18,7 +18,7 @@ # configuration to. (default: jenkins) echo "---> jenkins-configure-global-vars.sh" -GROOVY_SCRIPT_FILE="jjb/global-jjb/jenkins-admin/set_global_properties.groovy" +GROOVY_SCRIPT_FILE="global-jjb/jenkins-admin/set_global_properties.groovy" silos="${jenkins_silos:-jenkins}" -- 2.16.6