summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-05-04 22:11:58 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-05-04 22:11:58 +0000
commit2076e6d359dc69e57d777034288a3466cfb0c11a (patch)
tree3d7e67dc9a42a80dd911f9c003d52f2255bbc2ce
parentc845a183f21846e269276e9234bdcf70d39cf114 (diff)
parentc48fb85faa46d28d76489cea1b83614a31bc14f4 (diff)
Merge "adding env vars to eventually replace the -r -c params"
-rw-r--r--jjb/apex/apex.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index f8e36f768..3ddc7b2cd 100644
--- 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