diff options
| -rw-r--r-- | ci/docker/Dockerfile | 2 | ||||
| -rwxr-xr-x | ci/docker_run.sh (renamed from ci/rubbos_docker_run.sh) | 4 | ||||
| -rwxr-xr-x | ci/run.sh | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/ci/docker/Dockerfile b/ci/docker/Dockerfile index bb6d64ef..217c1361 100644 --- a/ci/docker/Dockerfile +++ b/ci/docker/Dockerfile @@ -8,7 +8,6 @@ ############################################################################## FROM ubuntu:14.04 -MAINTAINER Qi Liang <liangqi1@huawei.com> LABEL image=opnfv/bottlenecks @@ -19,6 +18,7 @@ ENV REPOS_DIR /home/opnfv ENV BOTTLENECKS_REPO_DIR ${REPOS_DIR}/bottlenecks ENV RELENG_REPO_DIR ${REPOS_DIR}/releng +#new test suite required packages can be added here RUN apt-get update && apt-get install -y \ curl \ wget \ diff --git a/ci/rubbos_docker_run.sh b/ci/docker_run.sh index 2eb3e16c..89300d4f 100755 --- a/ci/rubbos_docker_run.sh +++ b/ci/docker_run.sh @@ -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}" -run_rubbos_testsuite=${BOTTLENECKS_TOP_DIR}/run_tests.sh -s rubbos +run_testsuite=${BOTTLENECKS_TOP_DIR}/run_tests.sh -s ${SUITE_NAME} echo ${envs} ${ops} ${volumes} # Run docker -cmd="sudo docker run ${opts} ${envs} ${volumes} opnfv/bottlenecks ${run_rubbos_testsuite}" +cmd="sudo docker run ${opts} ${envs} ${volumes} opnfv/bottlenecks ${run_testsuite}" echo "Bottlenecks: Running docker cmd: ${cmd}" ${cmd} @@ -14,7 +14,6 @@ SCRIPT_DIR=`cd ${BASH_SOURCE[0]%/*};pwd` export BOTTLENECKS_TOP_DIR=$SCRIPT_DIR/../ export GERRIT_REFSPEC_DEBUG=$1 -$SCRIPT_DIR/rubbos_docker_run.sh +$SCRIPT_DIR/docker_run.sh set +ex - |