Add ci run scirpts 57/5457/4
authorQiLiang <liangqi1@huawei.com>
Mon, 4 Jan 2016 08:58:23 +0000 (08:58 +0000)
committerQiLiang <liangqi1@huawei.com>
Mon, 4 Jan 2016 10:37:03 +0000 (10:37 +0000)
JIRA: -

Change-Id: I94a0ea01fa7df0e279a605457148fdc4f3f03fb8
Signed-off-by: QiLiang <liangqi1@huawei.com>
ci/run.sh [new file with mode: 0755]
utils/infra_setup/heat_template/HOT_create_instance.sh
utils/infra_setup/vm_dev_setup/setup_env.sh

diff --git a/ci/run.sh b/ci/run.sh
new file mode 100755 (executable)
index 0000000..07b25df
--- /dev/null
+++ b/ci/run.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+
+set -ex
+
+BOTTLENECKS_REPO=https://gerrit.opnfv.org/gerrit/bottlenecks
+
+SCRIPT_DIR=`cd ${BASH_SOURCE[0]%/*};pwd`
+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/../utils/infra_setup/heat_template/HOT_create_instance.sh $GERRIT_REFSPEC_DEBUG
+
+set +ex
+
index ecb9ab8..bcd9f04 100755 (executable)
@@ -2,6 +2,8 @@
 
 set -ex
 
+GERRIT_REFSPEC_DEBUG=$1
+
 bottlenecks_env_prepare()
 {
     if [ -d $BOTTLENECKS_REPO_DIR ]; then
@@ -11,6 +13,9 @@ bottlenecks_env_prepare()
     mkdir -p ${BOTTLENECKS_REPO_DIR}
     git config --global http.sslVerify false
     git clone ${BOTTLENECKS_REPO} ${BOTTLENECKS_REPO_DIR}
+    if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
+        git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && git checkout FETCH_HEAD
+    fi
 
     source $BOTTLENECKS_REPO_DIR/rubbos/rubbos_scripts/1-1-1/scripts/env_preparation.sh
     chmod 600 $KEY_PATH/bottlenecks_key
@@ -94,6 +99,8 @@ bottlenecks_rubbos_run()
         /etc/resolv.conf | awk '{ print $2 '})
     echo "nameserver_ip=$nameserver_ip" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf
 
+    echo "GERRIT_REFSPEC_DEBUG=$GERRIT_REFSPEC_DEBUG" >> $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup/hosts.conf
+
     scp $ssh_args -r \
         $BOTTLENECKS_REPO_DIR/utils/infra_setup/vm_dev_setup \
         ec2-user@$control_ip:/tmp
index 52579e0..8ba7660 100755 (executable)
@@ -51,10 +51,17 @@ bottlenecks_download_repo()
     if [ -d $BOTTELENECKS_REPO_DIR/.git ]; then
         cd $BOTTLENECKS_REPO_DIR
         sudo git pull origin master
+        if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
+            sudo git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && git checkout FETCH_HEAD
+        fi
         cd -
     else
         sudo rm -rf $BOTTLENECKS_REPO_DIR
         sudo git clone $BOTTLENECKS_REPO $BOTTLENECKS_REPO_DIR
+        if [ x"$GERRIT_REFSPEC_DEBUG" != x ]; then
+            sudo git fetch $BOTTLENECKS_REPO $GERRIT_REFSPEC_DEBUG && git checkout FETCH_HEAD
+        fi
+
     fi
 }