aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtests/ci/clean_images.sh2
-rwxr-xr-xtools/ubuntu-server-cloudimg-modify.sh31
-rwxr-xr-xtools/yardstick-img-modify29
3 files changed, 4 insertions, 58 deletions
diff --git a/tests/ci/clean_images.sh b/tests/ci/clean_images.sh
index fa4a54df6..3579909c5 100755
--- a/tests/ci/clean_images.sh
+++ b/tests/ci/clean_images.sh
@@ -20,7 +20,7 @@ cleanup()
fi
for image in $(openstack image list | grep -e cirros-0.3.3 -e yardstick-image -e Ubuntu-14.04 \
- -e yardstick-vivid-kernel | awk '{print $2}'); do
+ | awk '{print $2}'); do
echo "Deleting image $image..."
openstack image delete $image || true
done
diff --git a/tools/ubuntu-server-cloudimg-modify.sh b/tools/ubuntu-server-cloudimg-modify.sh
index fb2ae3fe8..66a645261 100755
--- a/tools/ubuntu-server-cloudimg-modify.sh
+++ b/tools/ubuntu-server-cloudimg-modify.sh
@@ -46,17 +46,6 @@ chpasswd: { expire: False }
ssh_pwauth: True
EOF
apt-get update
-if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
- apt-get install -y \
- linux-headers-"$(echo ${CLOUD_KERNEL_VERSION} | cut -d'-' -f3,4,5)" \
- unzip
- #resize root partition (/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 \
bc \
fio \
@@ -81,16 +70,8 @@ CLONE_DEST=/opt/tempT
# remove before cloning
rm -rf -- "${CLONE_DEST}"
-if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
- wget https://github.com/kdlucas/byte-unixbench/archive/master.zip
- unzip master.zip && rm master.zip
- mkdir "${CLONE_DEST}"
- mv byte-unixbench-master/UnixBench "${CLONE_DEST}"
- 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' "${CLONE_DEST}/UnixBench/Makefile"
-else
- git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}"
-fi
+git clone https://github.com/kdlucas/byte-unixbench.git "${CLONE_DEST}"
+
make --directory "${CLONE_DEST}/UnixBench/"
if [ "${YARD_IMG_ARCH}" = "arm64" ]; then
@@ -105,13 +86,7 @@ cd "${CLONE_DEST}/RAMspeed/ramspeed-2.6.0"
mkdir temp
bash build.sh
-if [[ "${YARD_IMG_ARCH}" = "arm64" && "$release" = "vivid" ]]; then
- wget https://github.com/beefyamoeba5/cachestat/archive/master.zip
- unzip master.zip && rm master.zip
- mv cachestat-master/cachestat "${CLONE_DEST}"
-else
- git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat"
-fi
+git clone https://github.com/beefyamoeba5/cachestat.git "${CLONE_DEST}/Cachestat"
# restore symlink
ln -sf /run/resolvconf/resolv.conf /etc/resolv.conf
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)
}