From c48fb85faa46d28d76489cea1b83614a31bc14f4 Mon Sep 17 00:00:00 2001
From: Dan Radez <dradez@redhat.com>
Date: Thu, 28 Apr 2016 18:33:13 -0400
Subject: adding env vars to eventually replace the -r -c params
Change-Id: Ia8b97836462cc693df321e36f33e02fc330d4af4
Signed-off-by: Dan Radez <dradez@redhat.com>
---
jjb/apex/apex.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 6dbea1a62..61a50daea 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
--
cgit