summaryrefslogtreecommitdiffstats
path: root/ci/rubbos_docker_run.sh
diff options
context:
space:
mode:
authorMatthewLi <matthew.lijun@huawei.com>2016-03-24 22:59:42 -0400
committerMatthewLi <matthew.lijun@huawei.com>2016-03-24 23:04:14 -0400
commit7ba76747d55669e2bbaf70a3061e1c0b5dea912e (patch)
tree4229fb6f5ef524fc41606fee85ab3ee07831311b /ci/rubbos_docker_run.sh
parent0e7348386f3c23eed8798d01313a9010e6e74851 (diff)
rubbos docker ci running improvement
JIRA: BOTTLENECK-48 Change-Id: Ic27b7b203b58cfc2cee6bda20391edb8966566b2 Signed-off-by: MatthewLi <matthew.lijun@huawei.com>
Diffstat (limited to 'ci/rubbos_docker_run.sh')
-rwxr-xr-xci/rubbos_docker_run.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/ci/rubbos_docker_run.sh b/ci/rubbos_docker_run.sh
index fe047b6f..d16d5ba0 100755
--- a/ci/rubbos_docker_run.sh
+++ b/ci/rubbos_docker_run.sh
@@ -10,7 +10,7 @@
set -ex
-docker build -t opnfv/bottlenecks ${BOTTLENECKS_TOP_DIR}/ci/docker/bottlenecks-ci/
+docker build -t opnfv/bottlenecks ${BOTTLENECKS_TOP_DIR}/ci/docker/
if [ x"${GERRIT_REFSPEC_DEBUG}" != x ]; then
opts="--privileged=true"
@@ -22,12 +22,12 @@ 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=${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
+run_rubbos_testsuite=${BOTTLENECKS_TOP_DIR}/ci/run_test.sh -s rubbos
echo ${envs} ${ops} ${volumes}
# Run docker
-cmd="sudo docker run ${opts} ${envs} ${volumes} opnfv/bottlenecks ${create_instance}"
+cmd="sudo docker run ${opts} ${envs} ${volumes} opnfv/bottlenecks ${run_rubbos_testsuite}"
echo "Bottlenecks: Running docker cmd: ${cmd}"
${cmd}