rubbos docker ci running improvement

JIRA: BOTTLENECK-48

Change-Id: Ic27b7b203b58cfc2cee6bda20391edb8966566b2
Signed-off-by: MatthewLi <matthew.lijun@huawei.com>

diff --git a/ci/common.sh b/ci/common.sh
index 5ee858f..1696632 100755 (executable)
--- a/ci/common.sh
+++ b/ci/common.sh
@@ -1,13 +1,15 @@
 #!/bin/bash
-
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
-#
+##############################################################################
 
 mkdir -p /home/opnfv/bottlenecks/config
-config_file=/home/opnfv/functest/config/bottlenecks_cfg.yaml
+config_file=/home/opnfv/bottlenecks/config/bottlenecks_cfg.yaml
 
 if [ ! -f ${config_file} ]; then
     default_config_file=$(find /home/opnfv/repos -name bottlenecks_cfg.yaml)

diff --git a/ci/docker/bottlenecks-ci/Dockerfile b/ci/docker/Dockerfile
similarity index 97%
rename from ci/docker/bottlenecks-ci/Dockerfile
rename to ci/docker/Dockerfile
index 7e54388..bb6d64e 100644 (file)
--- a/ci/docker/bottlenecks-ci/Dockerfile
+++ b/ci/docker/Dockerfile
@@ -13,7 +13,7 @@ MAINTAINER Qi Liang <liangqi1@huawei.com>
 LABEL image=opnfv/bottlenecks
 
 # GIT repo directory
-ENV REPOS_DIR /home/opnfv/repos
+ENV REPOS_DIR /home/opnfv
 
 # Bottlenecks repo
 ENV BOTTLENECKS_REPO_DIR ${REPOS_DIR}/bottlenecks

diff --git a/ci/rubbos_docker_run.sh b/ci/rubbos_docker_run.sh
index fe047b6..d16d5ba 100755 (executable)
--- 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}
 

diff --git a/ci/run_tests.sh b/ci/run_tests.sh
index 95f53d5..0541e05 100755 (executable)
--- a/ci/run_tests.sh
+++ b/ci/run_tests.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 ##############################################################################
-# Copyright (c) 2015 Huawei Technologies Co.,Ltd and others.
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
 #
 # All rights reserved. This program and the accompanying materials
 # are made available under the terms of the Apache License, Version 2.0
@@ -41,7 +41,7 @@ function check_testcase(){
     esac
 
     TEST_CASE=$2
-    
+
     #find all the test case yaml files first
     find $SUITE_PREFIX -name "*yaml" > /tmp/all_testcases.yaml
     all_testcases_insuite=`cat /tmp/all_testcases.yaml | awk -F '/' '{print $NF}' | awk -F '.' '{print $1}'`
@@ -77,7 +77,6 @@ function run_test(){
                 #check if the testcase is legal or not
                 check_testcase -rubbos $i
                 #adjust config parameters, different test suite has different methods, take rubbos as an example
-                
                 #run test case, different test suite has different methods
 
             done