aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJing Lu <lvjing5@huawei.com>2016-12-01 06:51:44 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-12-01 06:51:44 +0000
commit5315d784b0cafd8834e8f406dd0308d122f79f98 (patch)
tree1e5f7f853a3b5d0f2aeb9b5cf6edb198539f3f7f
parenta2db76f27e4daac2c967f37d8c6b82ac3c161aa0 (diff)
parent960635ab999122e6da4934f2e826ba394e6a1d53 (diff)
Merge "arm64: Using wily kernel since the vivid is gone" into stable/coloradocolorado.3.0stable/colorado
-rwxr-xr-xtests/ci/yardstick-verify6
-rwxr-xr-xtools/yardstick-img-modify28
2 files changed, 17 insertions, 17 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index c26bd9d..1e35f7c 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
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index 07f10b3..7a43e44 100755
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -70,22 +70,22 @@ download() {
if [ $YARD_IMG_ARCH = "arm64" ]; then
cd /tmp
- if [ ! -f /tmp/vivid-server-cloudimg-arm64-kernel-info.txt ]; then
- wget http://cloud-images.ubuntu.com/vivid/current/vivid-server-cloudimg-arm64-kernel-info.txt
+ if [ ! -f /tmp/wily-server-cloudimg-arm64-kernel-info.txt ]; then
+ wget http://cloud-images.ubuntu.com/wily/current/wily-server-cloudimg-arm64-kernel-info.txt
fi
- export VIVID_KERNEL_VERSION=$(cut -d$'\t' -f4 vivid-server-cloudimg-arm64-kernel-info.txt)
- mkdir -p /tmp/vivid-modules
- if [ ! -f "/tmp/vivid-server-cloudimg-arm64.tar.gz" ]; then
+ export VIVID_KERNEL_VERSION=$(cut -d$'\t' -f4 wily-server-cloudimg-arm64-kernel-info.txt)
+ mkdir -p /tmp/wily-modules
+ if [ ! -f "/tmp/wily-server-cloudimg-arm64.tar.gz" ]; then
wget $VIVID_IMG_URL
fi
- if [ ! -f "/tmp/vivid-server-cloudimg-arm64.img" ]; then
- tar zxvf vivid-server-cloudimg-arm64.tar.gz vivid-server-cloudimg-arm64.img
+ if [ ! -f "/tmp/wily-server-cloudimg-arm64.img" ]; then
+ tar zxvf wily-server-cloudimg-arm64.tar.gz wily-server-cloudimg-arm64.img
fi
- mkdir -p /mnt/vivid
- mount /tmp/vivid-server-cloudimg-arm64.img /mnt/vivid
- cp -r /mnt/vivid/lib/modules/$(echo $VIVID_KERNEL_VERSION | cut -d'-' -f3,4,5) /tmp/vivid-modules
- umount /mnt/vivid
- rm /tmp/vivid-server-cloudimg-arm64.img
+ mkdir -p /mnt/wily
+ mount /tmp/wily-server-cloudimg-arm64.img /mnt/wily
+ cp -r /mnt/wily/lib/modules/$(echo $VIVID_KERNEL_VERSION | cut -d'-' -f3,4,5) /tmp/wily-modules
+ umount /mnt/wily
+ rm /tmp/wily-server-cloudimg-arm64.img
cd $workspace
fi
qemu-img convert $filename $raw_imgfile
@@ -115,7 +115,7 @@ setup() {
mount -t proc none $mountdir/proc
if [ $YARD_IMG_ARCH = "arm64" ]; then
- cp -r /tmp/vivid-modules/$(echo $VIVID_KERNEL_VERSION | cut -d'-' -f3,4,5) "$mountdir/lib/modules"
+ cp -r /tmp/wily-modules/$(echo $VIVID_KERNEL_VERSION | cut -d'-' -f3,4,5) "$mountdir/lib/modules"
cp $(which "qemu-aarch64-static") "$mountdir/usr/bin"
fi
cp $cmd $mountdir/$(basename $cmd)
@@ -150,7 +150,7 @@ cleanup() {
# designed to be idempotent
mount | grep $mountdir/proc && umount $mountdir/proc
mount | grep $mountdir && umount $mountdir
- mount | grep "/mnt/vivid" && umount "/mnt/vivid"
+ mount | grep "/mnt/wily" && umount "/mnt/wily"
if [ -f $raw_imgfile ]; then
kpartx -dv $raw_imgfile || true
fi