diff options
| -rw-r--r-- | jjb/functest/functest.yml | 18 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick.yml | 27 |
2 files changed, 38 insertions, 7 deletions
diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 3a63f0f82..95a2cbcbc 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -18,7 +18,7 @@ installer_type: 'apex' installer_ip: '192.168.X.X' - compass: - node: 'huawei-us' + node: 'huawei-us-deploy-bare-1' installer_type: 'compass' installer_ip: '192.168.200.2' pod: @@ -37,6 +37,12 @@ installer_type: 'joid' installer_ip: '127.0.0.1' + - huawei-build: + node: 'huawei-us-deploy-bare-1' + installer_type: 'compass' + installer_ip: '192.168.200.2' + + jobs: - 'set-functest-env-{pod}' - 'functest-{pod}' @@ -383,7 +389,15 @@ - string: name: SSH_KEY default: "/root/.ssh/id_rsa" - description: "SSH public key to access the installer VM" + description: "SSH private key to access the installer VM" + +- parameter: + name: huawei-build + parameters: + - string: + name: GIT_BASE + default: ssh://gerrit.opnfv.org:29418/$PROJECT + description: "Override GIT_BASE" - parameter: name: opnfv-jump-2 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!" |