summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAric Gardner <agardner@linuxfoundation.org>2018-01-29 14:27:18 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-29 14:27:18 +0000
commit90a178a3986212b320bff506d0be42dd0e3928e9 (patch)
treefe53a68456c1f8bb73f0cd228eac0a718fed6ad1
parent92e574a824d6943de6923ad1058afe29f85f9614 (diff)
parent6b76235f31235c0197460975836afba0bc0fec4b (diff)
Merge "[fuel] Retire 'BRIDGE' slave param"
-rwxr-xr-xjjb/fuel/fuel-deploy.sh4
-rw-r--r--jjb/global/installer-params.yml4
2 files changed, 2 insertions, 6 deletions
diff --git a/jjb/fuel/fuel-deploy.sh b/jjb/fuel/fuel-deploy.sh
index 7fe10c662..35bf3dc01 100755
--- a/jjb/fuel/fuel-deploy.sh
+++ b/jjb/fuel/fuel-deploy.sh
@@ -38,7 +38,6 @@ fi
# set deployment parameters
export TMPDIR=${HOME}/tmpdir
-BRIDGE=${BRIDGE:-pxebr}
# shellcheck disable=SC2153
LAB_NAME=${NODE_NAME/-*}
# shellcheck disable=SC2153
@@ -77,6 +76,7 @@ if [[ "$BRANCH" =~ (danube|euphrates) ]]; then
rm -rf "${LOCAL_CFG}"
git clone --quiet --branch "${BRANCH}" "${LAB_CONFIG_URL}" "${LOCAL_CFG}"
LAB_CONFIG_ARG="-b file://${LOCAL_CFG}"
+ BRIDGE_ARG="-B ${BRIDGE:-pxebr}"
else
LAB_CONFIG_ARG="-b ${LAB_CONFIG_URL}"
fi
@@ -88,7 +88,7 @@ FUEL_LOG_FILENAME="${JOB_NAME}_${BUILD_NUMBER}.log.tar.gz"
# construct the command
DEPLOY_COMMAND="${SUDO} ${WORKSPACE}/ci/deploy.sh ${LAB_CONFIG_ARG:-} \
-l ${LAB_NAME} -p ${POD_NAME} -s ${DEPLOY_SCENARIO} ${ISO_FILE_ARG:-} \
- -B ${DEFAULT_BRIDGE:-${BRIDGE}} -S ${TMPDIR} \
+ -S ${TMPDIR} ${BRIDGE_ARG:-} \
-L ${WORKSPACE}/${FUEL_LOG_FILENAME}"
# log info to console
diff --git a/jjb/global/installer-params.yml b/jjb/global/installer-params.yml
index 916db808d..7682121af 100644
--- a/jjb/global/installer-params.yml
+++ b/jjb/global/installer-params.yml
@@ -51,10 +51,6 @@
default: 'floating_net'
description: 'external network for test'
- string:
- name: BRIDGE
- default: 'pxebr'
- description: 'Bridge(s) to be used by salt master'
- - string:
name: GS_URL
default: '$GS_BASE{gs-pathname}'
description: "URL to Google Storage."