diff options
| -rw-r--r-- | jjb/functest/functest.yml | 15 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick.yml | 27 | ||||
| -rwxr-xr-x | utils/fetch_os_creds.sh | 2 |
3 files changed, 37 insertions, 7 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 8fc31cff5..343309e19 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -22,6 +22,11 @@ installer_type: 'compass' installer_ip: '192.168.200.2' pod: + - opnfv-jump-1: + node: 'opnfv-jump-1' + installer_type: 'apex' + installer_ip: '192.168.X.X' + - orange-test1: node: 'orange-test1' installer_type: 'fuel' @@ -381,6 +386,10 @@ name: GIT_BASE default: ssh://gerrit.opnfv.org:29418/$PROJECT description: "Override GIT_BASE" + - string: + name: SSH_KEY + default: "/root/.ssh/id_rsa" + description: "SSH public key to access the installer VM" - parameter: name: huawei-build @@ -444,8 +453,12 @@ if [ -n "${LAB_CONFIG}" ]; then labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds" fi + if [ -n "${SSH_KEY}" ]; then + sshkey="-v ${SSH_KEY}:/root/.ssh/id_rsa" + fi + docker pull opnfv/functest:latest_stable - cmd="docker run -id -e $envs ${labconfig} opnfv/functest:latest_stable /bin/bash" + cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash" echo "Functest: Running docker run command: ${cmd}" ${cmd} docker ps -a diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index 65d98621c..8a6edbb4c 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -189,13 +189,27 @@ echo "Yardstick: Run benchmark test suites ..." # Remove old containers - docker ps | grep opnfv/yardstick-ci |\ + docker ps | grep opnfv/yardstick |\ awk '{print $1}' | xargs -r docker stop &>/dev/null - docker ps -a | grep opnfv/yardstick-ci |\ + docker ps -a | grep opnfv/yardstick |\ awk '{print $1}' | xargs -r docker rm &>/dev/null + # Remove existing images if exist + if [[ ! -z $(docker images | grep opnfv/yardstick) ]]; then + echo "Docker images to remove:" + docker images | head -1 && docker images | grep opnfv/yardstick + image_tags=($(docker images | grep opnfv/yardstick | awk '{print $2}')) + for tag in "${image_tags[@]}"; do + echo "Removing docker image opnfv/yardstick:$tag..." + docker rmi opnfv/yardstick:$tag + done + fi + # Make sure we have latest image - docker pull opnfv/yardstick-ci + docker pull opnfv/yardstick + + # Test suites to run + TEST_SUITES=opnfv_${POD_NAME}_daily.yaml docker run \ --privileged=true \ @@ -203,8 +217,11 @@ -t \ -e "INSTALLER_TYPE=${INSTALLER_TYPE}" \ -e "INSTALLER_IP=${INSTALLER_IP}" \ - opnfv/yardstick-ci \ - run_benchmarks + -e "POD_NAME=${POD_NAME}" \ + -e "EXTERNAL_NETWORK=net04_ext" \ + opnfv/yardstick \ + run_tests.sh \ + $TEST_SUITES echo "Yardstick: done!" diff --git a/utils/fetch_os_creds.sh b/utils/fetch_os_creds.sh index 93d68e84e..7856e0dd7 100755 --- a/utils/fetch_os_creds.sh +++ b/utils/fetch_os_creds.sh @@ -106,7 +106,7 @@ elif [ "$installer_type" == "apex" ]; then # The credentials file is located in the Instack VM (192.0.2.1) # NOTE: This might change for bare metal deployments info "Fetching rc file from Instack VM $installer_ip..." - sudo scp root@$installer_ip:/home/stack/overcloudrc $dest_path &> /dev/null + sudo scp $ssh_options root@$installer_ip:/home/stack/overcloudrc $dest_path elif [ "$installer_type" == "compass" ]; then verify_connectivity $installer_ip |