From caa7ed3cf693e4ab499e9562116e73a212ac665f Mon Sep 17 00:00:00 2001 From: QiLiang Date: Sat, 16 Jan 2016 14:55:07 +0000 Subject: Scripts update to run rubbos on compass4nfv env 3 JIRA: - Change-Id: Ia962fbbd8a0479c86f5afbde8232ef36e1740e47 Signed-off-by: QiLiang --- ci/rubbos_docker_run.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ci/rubbos_docker_run.sh') diff --git a/ci/rubbos_docker_run.sh b/ci/rubbos_docker_run.sh index 3b0f041b..f1315e9e 100755 --- a/ci/rubbos_docker_run.sh +++ b/ci/rubbos_docker_run.sh @@ -6,11 +6,13 @@ docker build -t opnfv/bottlenecks ${BOTTLENECKS_TOP_DIR}/ci/docker/bottlenecks-c if [ x"${GERRIT_REFSPEC_DEBUG}" != x ]; then opts="--privileged=true" + BOTTLENECKS_BRANCH=${GERRIT_REFSPEC_DEBUG} else opts="--privileged=true --rm" + BOTTLENECKS_BRANCH=${GIT_BRANCH##origin/} fi -envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} -e BOTTLENECKS_BRANCH=${GIT_BRANCH##origin/} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL}" +envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NET=${EXTERNAL_NETWORK} -e BOTTLENECKS_BRANCH=${BOTTLENECKS_BRANCH} -e GERRIT_REFSPEC_DEBUG=${GERRIT_REFSPEC_DEBUG} -e BOTTLENECKS_DB_TARGET=${BOTTLENECKS_DB_TARGET} -e PACKAGE_URL=${PACKAGE_URL}" volumes="-v ${BOTTLENECKS_TOP_DIR}:${BOTTLENECKS_TOP_DIR}" create_instance=${BOTTLENECKS_TOP_DIR}/utils/infra_setup/heat_template/HOT_create_instance.sh -- cgit 1.2.3-korg