diff options
| author |   Jing Lu <lvjing5@huawei.com> | 2017-03-21 01:24:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-03-21 01:24:16 +0000 |
| commit | 4eacd85d78a0fbc1fee8224777634df84e7bce34 (patch) | |
| tree | 1441195ef0c8d552b8628224f2a3f4033375faa0 /tools/yardstick-img-modify | |
| parent | d742db328b70415c726ae9ed0aa7f16d79d7c852 (diff) | |
| parent | 14172bb39e8e30f37ec5bb80be6b187ab6858e88 (diff) | |
Merge "Bugfix: remove vivid as it is EOL"
Diffstat (limited to 'tools/yardstick-img-modify')
| -rwxr-xr-x | tools/yardstick-img-modify | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify index 658717c71..81a9ed783 100755 --- a/tools/yardstick-img-modify +++ b/tools/yardstick-img-modify @@ -76,27 +76,6 @@ download() { [ -a /dev/loop$i ] || mknod -m 660 /dev/loop$i b 7 $i done - if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then - cd /tmp - if [ ! -f /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt ]; then - wget http://${host}/${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt - fi - export CLOUD_KERNEL_VERSION=$(cut -d$'\t' -f4 ${release}-server-cloudimg-${YARD_IMG_ARCH}-kernel-info.txt) - - mkdir -p /tmp/${release}-modules - if [ ! -f "/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz" ]; then - wget $CLOUD_IMG_URL - fi - if [ ! -f "/tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img" ]; then - tar zxvf ${release}-server-cloudimg-${YARD_IMG_ARCH}.tar.gz ${release}-server-cloudimg-${YARD_IMG_ARCH}.img - fi - mkdir -p /mnt/${release} - mount /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img /mnt/${release} - cp -r /mnt/${release}/lib/modules/$(echo $CLOUD_KERNEL_VERSION) /tmp/${release}-modules - umount /mnt/${release} - rm /tmp/${release}-server-cloudimg-${YARD_IMG_ARCH}.img - cd $workspace - fi qemu-img convert $filename $raw_imgfile cd - } @@ -113,10 +92,6 @@ setup() { kpartx -av $raw_imgfile - if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then - e2fsck -p -f /dev/mapper/$loopdevice - resize2fs /dev/mapper/$loopdevice - fi # for trouble shooting sleep 2 dmsetup ls @@ -124,10 +99,6 @@ setup() { mount /dev/mapper/$loopdevice $mountdir mount -t proc none $mountdir/proc - if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then - cp -r /tmp/${release}-modules/$(echo $CLOUD_KERNEL_VERSION) "$mountdir/lib/modules" - cp $(which "qemu-aarch64-static") "$mountdir/usr/bin" - fi cp $cmd $mountdir/$(basename $cmd) } |