From 60ccbbf50b37724b9ed9fe5da4ac747fb6ab0f45 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Thu, 2 Feb 2017 13:49:26 -0500 Subject: Apex: fixes csit promote deployment job Points deployment to local artifacts and not RPMs Change-Id: I6d65dd644b7e7d1d2f54738e30a56e5d0e75131f Signed-off-by: Tim Rozet --- jjb/apex/apex-deploy.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'jjb/apex/apex-deploy.sh') diff --git a/jjb/apex/apex-deploy.sh b/jjb/apex/apex-deploy.sh index 776b76ed0..9535e7fb7 100755 --- a/jjb/apex/apex-deploy.sh +++ b/jjb/apex/apex-deploy.sh @@ -15,7 +15,7 @@ if ! rpm -q wget > /dev/null; then sudo yum -y install wget fi -if [[ $BUILD_DIRECTORY == *verify* ]]; then +if [[ "$BUILD_DIRECTORY" == *verify* || "$BUILD_DIRECTORY" == *csit* ]]; then # Build is from a verify, use local build artifacts (not RPMs) cd $WORKSPACE/../${BUILD_DIRECTORY} WORKSPACE=$(pwd) @@ -64,8 +64,8 @@ if [ -z "$DEPLOY_SCENARIO" ]; then exit 1 fi -# use local build for verify -if [[ "$BUILD_DIRECTORY" == *verify* ]]; then +# use local build for verify and csit promote +if [[ "$BUILD_DIRECTORY" == *verify* || "$BUILD_DIRECTORY" == *csit* ]]; then if [ ! -e "${WORKSPACE}/build/lib" ]; then ln -s ${WORKSPACE}/lib ${WORKSPACE}/build/lib fi @@ -144,7 +144,7 @@ if [ "$OPNFV_CLEAN" == 'yes' ]; then else clean_opts='' fi - if [[ "$BUILD_DIRECTORY" == *verify* ]]; then + if [[ "$BUILD_DIRECTORY" == *verify* || "$BUILD_DIRECTORY" == *csit* ]]; then sudo CONFIG=${CONFIG} LIB=${LIB} ./clean.sh ${clean_opts} else sudo CONFIG=${CONFIG} LIB=${LIB} opnfv-clean ${clean_opts} -- cgit 1.2.3-korg