Merge "adding env vars to eventually replace the -r -c params"

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index f8e36f7..3ddc7b2 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -892,7 +892,7 @@
             # use local build for verify
             if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
                 if [ ! -e "${WORKSPACE}/build/lib" ]; then ln -s ${WORKSPACE}/lib ${WORKSPACE}/build/lib; fi
-                DEPLOY_CMD="./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/"
+                DEPLOY_CMD="CONFIG=${WORKSPACE}/build RESOURCES=${WORKSPACE}/build/images/ ./deploy.sh -c ${WORKSPACE}/build -r ${WORKSPACE}/build/images/"
                 DEPLOY_FILE="${WORKSPACE}/config/deploy/${DEPLOY_SCENARIO}.yaml"
                 NETWORK_FILE="${WORKSPACE}/config/network/network_settings.yaml"
                 # Make sure python34 is installed
@@ -941,7 +941,7 @@
 
             if [ "$OPNFV_CLEAN" == 'yes' ]; then
                 if [[ $BUILD_DIRECTORY == *verify-master* ]]; then
-                    sudo ./clean.sh
+                    sudo CONFIG=../lib ./clean.sh
                 else
                     sudo opnfv-clean
                 fi