From 2bf95e68a19fc3a7c1e3236a977b1d3b6db1c05c Mon Sep 17 00:00:00 2001 From: Yujun Zhang Date: Fri, 8 Sep 2017 17:08:59 +0800 Subject: Refactor CI scripts - Move scripts executed inside container to qtip/scripts - tests/ci is limited to setup the environment and start services Change-Id: I454c715890601c6c6472006c2f0f6131695c2f51 Signed-off-by: Yujun Zhang --- tests/ci/launch_containers_by_testsuite.sh | 73 ------------------------------ 1 file changed, 73 deletions(-) delete mode 100755 tests/ci/launch_containers_by_testsuite.sh (limited to 'tests/ci/launch_containers_by_testsuite.sh') diff --git a/tests/ci/launch_containers_by_testsuite.sh b/tests/ci/launch_containers_by_testsuite.sh deleted file mode 100755 index 08b80028..00000000 --- a/tests/ci/launch_containers_by_testsuite.sh +++ /dev/null @@ -1,73 +0,0 @@ -#! /bin/bash -############################################################################## -# Copyright (c) 2017 ZTE 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 -############################################################################## - -export ENV_FILE="${WORKSPACE}/env_file" - -if [[ -e $ENV_FILE ]];then - rm $ENV_FILE -fi - -case $INSTALLER_TYPE in - apex) - INSTALLER_IP=`sudo virsh domifaddr undercloud | grep ipv4 | awk '{print $4}' | cut -d/ -f1` - ;; -esac - -echo "INSTALLER_TYPE=$INSTALLER_TYPE" >> $ENV_FILE -echo "INSTALLER_IP=$INSTALLER_IP" >> $ENV_FILE -echo "NODE_NAME=$NODE_NAME" >> $ENV_FILE -echo "SCENARIO=$DEPLOY_SCENARIO" >> $ENV_FILE -echo "TESTAPI_URL=$TESTAPI_URL" >> $ENV_FILE - -if [[ "$TEST_SUITE" == 'compute' ]];then - - echo "--------------------------------------------------------" - cat $ENV_FILE - echo "--------------------------------------------------------" - - echo "Qtip: Pulling docker image: opnfv/qtip:${DOCKER_TAG}" - docker pull opnfv/qtip:$DOCKER_TAG >/dev/null - - envs="--env-file $ENV_FILE" - vols="" - if [[ "$INSTALLER_TYPE" == "apex" ]];then vols="-v /root/.ssh:/root/.ssh" - fi - - container_name="qtip-${TEST_SUITE}" - if [[ -n $(docker ps -a|grep ${container_name}) ]]; then - echo "QTIP: cleaning existing container" - docker stop ${container_name} - docker rm ${container_name} - fi - - cmd="sudo docker run -id --name ${container_name} ${envs} ${vols} opnfv/qtip:${DOCKER_TAG} /bin/bash" - echo "Qtip: Running docker command: ${cmd}" - ${cmd} - -elif [[ "$TEST_SUITE" == 'storage' ]];then - script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" - - curl https://git.opnfv.org/releng/plain/utils/fetch_os_creds.sh | bash -s -- \ - -i $INSTALLER_TYPE -a $INSTALLER_IP -d $WORKSPACE/openrc - - grep "export" $WORKSPACE/openrc | sed "s/export //" >> $ENV_FILE - echo "DOCKER_TAG=$DOCKER_TAG" >> $ENV_FILE - - echo "--------------------ENV_FILE----------------------------" - cat $ENV_FILE - echo "--------------------------------------------------------" - - source $script_dir/storperf/containers.sh - cd $script_dir/storperf - clean_containers - launch_containers -else - echo "QTIP: Sorry, not support test suite $TEST_SUITE!" - exit 1 -fi -- cgit 1.2.3-korg