X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Frubbos_docker_run.sh;h=f1315e9e051d2fbc87a6b0269301f540ac8ad25f;hb=caa7ed3cf693e4ab499e9562116e73a212ac665f;hp=3b0f041bd382724f47ab8526ef229baa8bc0acd9;hpb=0e5f71563fe8dd2a5e357b37d303331ee0f13c9d;p=bottlenecks.git 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