summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorQiLiang <liangqi1@huawei.com>2016-01-16 09:58:05 +0000
committerQiLiang <liangqi1@huawei.com>2016-01-16 13:49:38 +0000
commitd519fff9ff4adaece9e3cc221800169602f58fec (patch)
tree06360a01df80f26ce8f640a79ccd897620ddae25 /ci
parent44fa06d65eafdcfce9671bdc09f2c8a6d7115982 (diff)
Scripts update to run rubbos on compass4nfv env 2
Enable stable branch checkout JIRA: - Change-Id: Ibe16adc4a6a1810a75b60ef9198ce7ea239d79c3 Signed-off-by: QiLiang <liangqi1@huawei.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/rubbos_docker_run.sh4
-rwxr-xr-xci/run.sh6
2 files changed, 2 insertions, 8 deletions
diff --git a/ci/rubbos_docker_run.sh b/ci/rubbos_docker_run.sh
index afc8493c..3b0f041b 100755
--- a/ci/rubbos_docker_run.sh
+++ b/ci/rubbos_docker_run.sh
@@ -5,12 +5,12 @@ set -ex
docker build -t opnfv/bottlenecks ${BOTTLENECKS_TOP_DIR}/ci/docker/bottlenecks-ci/
if [ x"${GERRIT_REFSPEC_DEBUG}" != x ]; then
- opts="--privileged=true -it"
+ opts="--privileged=true"
else
opts="--privileged=true --rm"
fi
-envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} -e NODE_NAME=${NODE_NAME} -e EXTERNAL_NETWORK=${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} -e EXTERNAL_NET=${EXTERNAL_NET}"
+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}"
volumes="-v ${BOTTLENECKS_TOP_DIR}:${BOTTLENECKS_TOP_DIR}"
create_instance=${BOTTLENECKS_TOP_DIR}/utils/infra_setup/heat_template/HOT_create_instance.sh
diff --git a/ci/run.sh b/ci/run.sh
index af9b46fb..2a9f0d31 100755
--- a/ci/run.sh
+++ b/ci/run.sh
@@ -2,16 +2,10 @@
set -ex
-BOTTLENECKS_REPO=https://gerrit.opnfv.org/gerrit/bottlenecks
-
SCRIPT_DIR=`cd ${BASH_SOURCE[0]%/*};pwd`
export BOTTLENECKS_TOP_DIR=$SCRIPT_DIR/../
export GERRIT_REFSPEC_DEBUG=$1
-if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
- git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && git checkout FETCH_HEAD
-fi
-
$SCRIPT_DIR/rubbos_docker_run.sh
set +ex