diff options
author | Jing Lu <lvjing5@huawei.com> | 2016-12-01 06:51:44 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@opnfv.org> | 2016-12-01 06:51:44 +0000 |
commit | 5315d784b0cafd8834e8f406dd0308d122f79f98 (patch) | |
tree | 1e5f7f853a3b5d0f2aeb9b5cf6edb198539f3f7f /tests/ci | |
parent | a2db76f27e4daac2c967f37d8c6b82ac3c161aa0 (diff) | |
parent | 960635ab999122e6da4934f2e826ba394e6a1d53 (diff) |
Merge "arm64: Using wily kernel since the vivid is gone" into stable/coloradocolorado.3.0stable/colorado
Diffstat (limited to 'tests/ci')
-rwxr-xr-x | tests/ci/yardstick-verify | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify index c26bd9deb..1e35f7c2c 100755 --- a/tests/ci/yardstick-verify +++ b/tests/ci/yardstick-verify @@ -46,7 +46,7 @@ DISPATCHER_HTTP_TARGET="http://testresults.opnfv.org/test/api/v1/results" DISPATCHER_INFLUXDB_TARGET= UCA_HOST="cloud-images.ubuntu.com" if [ $YARD_IMG_ARCH = "arm64" ]; then - export VIVID_IMG_URL="http://${UCA_HOST}/vivid/current/vivid-server-cloudimg-arm64.tar.gz" + export VIVID_IMG_URL="http://${UCA_HOST}/wily/current/wily-server-cloudimg-arm64.tar.gz" if ! grep -q "Defaults env_keep += \"VIVID_IMG_URL\"" "/etc/sudoers"; then sudo echo "Defaults env_keep += \"VIVID_IMG_URL\"" >> /etc/sudoers fi @@ -259,8 +259,8 @@ load_yardstick_image() echo "========== Loading yardstick cloud image ==========" EXTRA_PARAMS="" if [ $YARD_IMG_ARCH = "arm64" ]; then - VIVID_IMAGE="/tmp/vivid-server-cloudimg-arm64.tar.gz" - VIVID_KERNEL="/tmp/vivid-server-cloudimg-arm64-vmlinuz-generic" + VIVID_IMAGE="/tmp/wily-server-cloudimg-arm64.tar.gz" + VIVID_KERNEL="/tmp/wily-server-cloudimg-arm64-vmlinuz-generic" cd /tmp if [ ! -f $VIVID_IMAGE ]; then wget $VIVID_IMG_URL |