summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-01 17:12:03 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2017-08-01 17:16:28 +0200
commitb497b922898c0ef737830b14de6c2e67a27c3ce3 (patch)
tree6af8f431fac172705f93f5e14cb6b204b0ea4f36 /jjb
parent054cc9c27668ccd18d970ee0c88138178301478b (diff)
fuel, armband: Temporarily remove pxebr deploy arg
Fuel and implicitly Armband switched to a newer format for parsing the "-B" deploy arg, used to pass bridge(s) information. For now, we will default to ",,,", which is equivalent to not setting any default value for any of the 4 possible bridges. NOTE: Armband overrides this on a per-pod basis, since bridge information is POD specific in our lab. Change-Id: I3635b0eb6f8233cf99022a97d5642f2e49197e3b Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'jjb')
-rwxr-xr-xjjb/armband/armband-deploy.sh2
-rwxr-xr-xjjb/fuel/fuel-deploy.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh
index 358b55ba2..8a3b60458 100755
--- a/jjb/armband/armband-deploy.sh
+++ b/jjb/armband/armband-deploy.sh
@@ -91,7 +91,7 @@ fi
# construct the command
DEPLOY_COMMAND="$WORKSPACE/ci/deploy.sh -b ${LAB_CONFIG_URL} \
-l $LAB_NAME -p $POD_NAME -s $DEPLOY_SCENARIO -i file://${ISO_FILE} \
- -H -B ${DEFAULT_BRIDGE:-pxebr} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
+ -H -B ${DEFAULT_BRIDGE:-,,,} -S $TMPDIR -L $WORKSPACE/$FUEL_LOG_FILENAME \
${DEPLOY_CACHE}"
# log info to console
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 2fb5c71e4..c9329bfa0 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -33,7 +33,7 @@ fi
# set deployment parameters
export TMPDIR=$HOME/tmpdir
-BRIDGE=${BRIDGE:-pxebr}
+BRIDGE=${BRIDGE:-,,,}
LAB_NAME=${NODE_NAME/-*}
POD_NAME=${NODE_NAME/*-}