X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=tools%2Fyardstick-img-modify;h=da8e1c92f13ada90cb1db72fcdea622dfab9568e;hb=5c9de80872ba4dc66f5398f266b7bb3a6ff3f694;hp=48462b80bf037e350375a48a6f91614248433408;hpb=d03858bbac357b6d705c7137d2d20d5c8e34ecc6;p=yardstick.git diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify index 48462b80b..da8e1c92f 100755 --- a/tools/yardstick-img-modify +++ b/tools/yardstick-img-modify @@ -23,63 +23,115 @@ # # TODO: image resize is needed if the base image is too small # - set -e +set -x die() { echo "error: $1" >&2 exit 1 } -test $# -eq 1 || die "no image specific script as argument" +test $# -eq 1 -o $# -eq 2 || die "no image specific script as argument" test $(id -u) -eq 0 || die "should invoke using sudo" cmd=$1 +RELEASE=$2 test -x $cmd mountdir="/mnt/yardstick" - workspace=${WORKSPACE:-"/tmp/workspace/yardstick"} host=${HOST:-"cloud-images.ubuntu.com"} -release=${RELEASE:-"trusty"} -image_path="${release}/current/${release}-server-cloudimg-amd64-disk1.img" +release=${RELEASE:-"xenial"} +boot_mode="disk1" +if [[ "${YARD_IMG_ARCH}" = "arm64" ]]; then + boot_mode="uefi1" +fi + +image_path="${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}-${boot_mode}.img" image_url=${IMAGE_URL:-"https://${host}/${image_path}"} md5sums_path="${release}/current/MD5SUMS" md5sums_url=${MD5SUMS_URL:-"https://${host}/${md5sums_path}"} -imgfile="${workspace}/yardstick-${release}-server.img" -raw_imgfile="${workspace}/yardstick-${release}-server.raw" +imgfile="${workspace}/yardstick-image.img" +raw_imgfile_basename="yardstick-${release}-server.raw" +raw_imgfile="${workspace}/${raw_imgfile_basename}" filename=$(basename $image_url) +apt-get install -y parted + # download and checksum base image, conditionally if local copy is outdated download() { test -d $workspace || mkdir -p $workspace cd $workspace rm -f MD5SUMS # always download the checksum file to a detect stale image wget $md5sums_url - test -e $filename || wget -nc $image_url + test -e $filename || wget -nc --progress=dot:giga $image_url grep $filename MD5SUMS | md5sum -c || if [ $? -ne 0 ]; then rm $filename - wget -nc $image_url + wget -nc --progress=dot:giga $image_url grep $filename MD5SUMS | md5sum -c fi + + for i in $(seq 0 9); do + [ -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 - } # mount image setup() { + # qemu-img resize $raw_imgfile +5GB + if [ "${YARD_IMG_ARCH}" = "arm64" ]; then + echo -e "d\nn\np\n1\n\n\nw" | parted -l $raw_imgfile + fi mkdir -p $mountdir - for i in $(seq 0 9); do - [ -a /dev/loop$i ] || mknod -m 660 /dev/loop$i b 7 $i - done + #kpartx fails with image paths longer than 63 characters + #try shortest relative path to image as temporary workaround + cd ${workspace} + loopdevice=$(kpartx -l $raw_imgfile_basename | head -1 | cut -f1 -d ' ') - loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ') + kpartx -av $raw_imgfile_basename + cd - - kpartx -a $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 + parted -l /dev/${loopdevice:0:5} || true 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) } @@ -89,30 +141,73 @@ modify() { nameserver_ip=$(grep -m 1 '^nameserver' \ /etc/resolv.conf | awk '{ print $2 '}) + # prevent init scripts from running during install + echo $'#!/bin/sh\nexit 101' >$mountdir/usr/sbin/policy-rc.d + chmod a+x $mountdir/usr/sbin/policy-rc.d + chroot $mountdir /$(basename $cmd) $nameserver_ip + rm -rf $mountdir/usr/sbin/policy-rc.d + + umount -f $mountdir/proc umount $mountdir + qemu-img convert -c -o compat=0.10 -O qcow2 $raw_imgfile $imgfile + + if dmsetup table | grep $loopdevice; then + dmsetup clear $loopdevice || true + fi } # cleanup (umount) the image cleanup() { # designed to be idempotent + mount | grep $mountdir/proc && umount $mountdir/proc mount | grep $mountdir && umount $mountdir - if [ -f $raw_imgfile ]; then - kpartx -d $raw_imgfile || true + mount | grep "/mnt/${release}" && umount "/mnt/${release}" + + if [ -f "${raw_imgfile}" ]; then + #kpartx -dv $raw_imgfile sometimes failed, we should checked it agein. + #if [ -z "$(kpartx -l $raw_imgfile | grep 'loop deleted')" ]; then + # kpartx -dv $raw_imgfile + #fi + kpartx -dv $raw_imgfile || true fi + rm -f $raw_imgfile rm -rf $mountdir } -set -x +exitcode="" +error_trap() +{ + local rc=$? + + set +e + + if [ -z "$exitcode" ]; then + exitcode=$rc + fi + + dmesg -T | tail -50 + + cleanup + + echo "Image build failed with $exitcode" + + exit $exitcode +} main() { cleanup + + trap "error_trap" EXIT SIGTERM + download setup modify + + trap - EXIT SIGTERM cleanup echo "the modified image is found here: $imgfile"