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 /tools | |
| 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 'tools')
| -rwxr-xr-x | tools/yardstick-img-modify | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify index 07f10b3ce..7a43e4437 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 |