summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ubuntu-server-cloudimg-modify.sh50
-rwxr-xr-xtools/yardstick-img-lxd-modify136
-rwxr-xr-xtools/yardstick-img-modify54
3 files changed, 222 insertions, 18 deletions
diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh
index 2e8399a9b..49c842c97 100755
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -24,9 +24,13 @@ if [ $# -eq 1 ]; then
fi
# iperf3 only available for trusty in backports
-grep trusty /etc/apt/sources.list && \
- echo "deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list
-
+if [ grep -q trusty /etc/apt/sources.list ]; then
+ if [ $YARD_IMG_ARCH = "arm64" ]; then
+ echo "deb [arch=arm64] http://ports.ubuntu.com/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list
+ else
+ echo "deb http://archive.ubuntu.com/ubuntu/ trusty-backports main restricted universe multiverse" >> /etc/apt/sources.list
+ fi
+fi
# Workaround for building on CentOS (apt-get is not working with http sources)
# sed -i 's/http/ftp/' /etc/apt/sources.list
@@ -41,8 +45,18 @@ password: RANDOM
chpasswd: { expire: False }
ssh_pwauth: True
EOF
-
apt-get update
+if [ $YARD_IMG_ARCH = "arm64" ]; then
+apt-get install -y \
+ linux-headers-$(echo $VIVID_KERNEL_VERSION | cut -d'-' -f3,4,5) \
+ unzip
+#resize root parition (/dev/vdb1) It is supposed to be default but the image is booted differently for arm64
+cat <<EOF >/etc/cloud/cloud.cfg.d/15_growpart.cfg
+#cloud-config
+bootcmd:
+ - [growpart, /dev/vdb, 1]
+EOF
+fi
apt-get install -y \
fio \
git \
@@ -59,15 +73,37 @@ apt-get install -y \
stress \
sysstat
-git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
+if [ $YARD_IMG_ARCH = "arm64" ]; then
+ wget https://github.com/kdlucas/byte-unixbench/archive/master.zip
+ unzip master.zip && rm master.zip
+ mkdir /opt/tempT
+ mv byte-unixbench-master/UnixBench /opt/tempT
+ sed -i -e 's/OPTON += -march=native -mtune=native/OPTON += -march=armv8-a -mtune=generic/g' \
+ -e 's/OPTON += -march=native/OPTON += -march=armv8-a/g' /opt/tempT/UnixBench/Makefile
+else
+ git clone https://github.com/kdlucas/byte-unixbench.git /opt/tempT
+fi
make --directory /opt/tempT/UnixBench/
-git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed
+if [ $YARD_IMG_ARCH = "arm64" ]; then
+ wget https://github.com/beefyamoeba5/ramspeed/archive/master.zip
+ unzip master.zip && rm master.zip
+ mkdir /opt/tempT/RAMspeed
+ mv ramspeed-master/* /opt/tempT/RAMspeed/
+else
+ git clone https://github.com/beefyamoeba5/ramspeed.git /opt/tempT/RAMspeed
+fi
cd /opt/tempT/RAMspeed/ramspeed-2.6.0
mkdir temp
bash build.sh
-git clone https://github.com/beefyamoeba5/cachestat.git /opt/tempT/Cachestat
+if [ $YARD_IMG_ARCH = "arm64" ]; then
+ wget https://github.com/beefyamoeba5/cachestat/archive/master.zip
+ unzip master.zip && rm master.zip
+ mv cachestat-master/cachestat /opt/tempT
+else
+ git clone https://github.com/beefyamoeba5/cachestat.git /opt/tempT/Cachestat
+fi
# restore symlink
ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf
diff --git a/tools/yardstick-img-lxd-modify b/tools/yardstick-img-lxd-modify
new file mode 100755
index 000000000..4ca4eb489
--- /dev/null
+++ b/tools/yardstick-img-lxd-modify
@@ -0,0 +1,136 @@
+#!/bin/bash
+
+##############################################################################
+# Copyright (c) 2016 Huawei Technologies Co.,Ltd and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+# yardstick-img-lxd-modify - download and modify a Ubuntu cloud image
+#
+# The actual customization is done by a script passed with an absolute path as
+# the only single argument. The command needs to be invoked as sudo
+#
+# Example invocation:
+# yardstick-img-lxd-modify /home/yardstick/tools/ubuntu-server-cloudimg-modify.sh
+#
+# Warning: the script will create files by default in:
+# /tmp/workspace/yardstick
+# the files will be owned by root!
+#
+# 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 -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:-"xenial"}
+image_path="${release}/current/${release}-server-cloudimg-amd64-root.tar.gz"
+image_url=${IMAGE_URL:-"https://${host}/${image_path}"}
+md5sums_path="${release}/current/MD5SUMS"
+md5sums_url=${MD5SUMS_URL:-"https://${host}/${md5sums_path}"}
+
+imgfile="${workspace}/yardstick-image.tar.gz"
+filename=$(basename $image_url)
+
+# 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 --progress=dot:giga $image_url
+ grep $filename MD5SUMS | md5sum -c ||
+ if [ $? -ne 0 ]; then
+ rm $filename
+ wget -nc --progress=dot:giga $image_url
+ grep $filename MD5SUMS | md5sum -c
+ fi
+ cd -
+}
+
+# extract files
+setup() {
+ mkdir -p $mountdir
+
+ cp $cmd $mountdir/$(basename $cmd)
+
+ cd $workspace
+ tar zxvf $filename -C $mountdir
+}
+
+# modify image running a script using in a chrooted environment
+modify() {
+ # resolv.conf does not exist in base image, pass nameserver value from host
+ 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
+
+ tar zcvf $(basename $imgfile) $mountdir/
+}
+
+# cleanup the image
+cleanup() {
+ rm -rf $mountdir
+}
+
+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"
+}
+
+main
diff --git a/tools/yardstick-img-modify b/tools/yardstick-img-modify
index 13d4360d9..c28e2ad59 100755
--- a/tools/yardstick-img-modify
+++ b/tools/yardstick-img-modify
@@ -32,22 +32,22 @@ die() {
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"}
+image_path="${release}/current/${release}-server-cloudimg-${YARD_IMG_ARCH}-disk1.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"
+imgfile="${workspace}/yardstick-image.img"
raw_imgfile="${workspace}/yardstick-${release}-server.raw"
filename=$(basename $image_url)
@@ -64,30 +64,61 @@ download() {
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" ]; 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
+ 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
+ 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
+ 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
+ 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" | fdisk $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
-
loopdevice=$(kpartx -l $raw_imgfile | head -1 | cut -f1 -d ' ')
kpartx -av $raw_imgfile
-
+ if [ $YARD_IMG_ARCH = "arm64" ]; then
+ e2fsck -p -f /dev/mapper/$loopdevice
+ resize2fs /dev/mapper/$loopdevice
+ fi
# for trouble shooting
sleep 2
dmsetup ls
fdisk -l /dev/${loopdevice:0:5} || true
-
mount /dev/mapper/$loopdevice $mountdir
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 $(which "qemu-aarch64-static") "$mountdir/usr/bin"
+ fi
cp $cmd $mountdir/$(basename $cmd)
}
@@ -120,6 +151,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"
if [ -f $raw_imgfile ]; then
kpartx -dv $raw_imgfile || true
fi