From: "Géza Gémes" <geza.gemes@gmail.com>
To: xen-devel@lists.xenproject.org
Cc: sstabellini@kernel.org, george.dunlap@citrix.com,
"Géza Gémes" <geza.gemes@gmail.com>
Subject: [PATCH 02/11] Introduce cirros tests
Date: Fri, 24 Mar 2017 19:59:27 +0100 [thread overview]
Message-ID: <1490381976-22981-3-git-send-email-geza.gemes@gmail.com> (raw)
In-Reply-To: <1490381976-22981-1-git-send-email-geza.gemes@gmail.com>
Add support for using cirros images in raisin tests
Signed-off-by: Géza Gémes <geza.gemes@gmail.com>
---
lib/common-functions.sh | 23 +++++++
lib/common-tests.sh | 126 +++++++++++++++++++++++++++++++++++++
tests-configs/config-cirros_x86_32 | 13 ++++
tests-configs/config-cirros_x86_64 | 13 ++++
4 files changed, 175 insertions(+)
create mode 100644 tests-configs/config-cirros_x86_32
create mode 100644 tests-configs/config-cirros_x86_64
diff --git a/lib/common-functions.sh b/lib/common-functions.sh
index d4476f3..d82d7ab 100644
--- a/lib/common-functions.sh
+++ b/lib/common-functions.sh
@@ -439,3 +439,26 @@ function uninstall_package() {
error_echo "Don't know how to uninstall packages on $DISTRO"
fi
}
+
+function get-qemu-img() {
+ set +e
+ QEMU_IMG=`which qemu-img`
+ set -e
+ if [[ -z "$QEMU_IMG" ]]
+ then
+ QEMU_IMG="/usr/lib/xen/bin/qemu-img"
+ fi
+ export QEMU_IMG
+}
+
+function get-pvgrub() {
+ ARCH=$1
+ set +e
+ PVGRUB=`which grub-${ARCH}-xen`
+ set -e
+ if [[ -z "$PVGRUB" ]]
+ then
+ PVGRUB="/usr/lib/xen/boot/grub-${ARCH}-xen"
+ fi
+ export PVGRUB
+}
diff --git a/lib/common-tests.sh b/lib/common-tests.sh
index d346af4..1deaf4f 100644
--- a/lib/common-tests.sh
+++ b/lib/common-tests.sh
@@ -178,3 +178,129 @@ function get_host_initrd() {
exit 1
fi
}
+
+function cirros_network_init() {
+ rootdir=$1
+ ifile=`mktemp`
+ # Create static network config
+ cat >$ifile <<EOF
+auto lo
+iface lo inet loopback
+
+auto eth0
+iface eth0 inet static
+ address 169.254.0.2
+ network 169.254.0.0
+ broadcast 169.254.0.255
+ netmask 255.255.255.0
+EOF
+ $SUDO mv $ifile $rootdir/etc/network/interfaces
+ # Disable cloud-init
+ $SUDO rm -f ${rootdir}/etc/rc3.d/S*cirros*ds*
+ $SUDO rm -f ${rootdir}/etc/rc3.d/S*-cirros-userdata
+}
+
+function get_cirros_kernel() {
+ bootdir=$1
+ basename `find $bootdir -name vmlinuz* 2>/dev/null | head -1`
+}
+
+function get_cirros_initrd() {
+ bootdir=$1
+ basename `find $bootdir -name initrd* 2>/dev/null | head -1`
+}
+
+function cirros_grub_cfg() {
+ rootdir=$1
+ grubroot="`echo $CIRROS_GRUB_CFG | cut -d ')' -f 1`)"
+ grubcfg="`echo $CIRROS_GRUB_CFG | cut -d ')' -f 2`"
+ grubdir=`dirname $grubcfg`
+ bootdir=`dirname $grubdir`
+ tmpgrubcfg=`mktemp`
+ cat > $tmpgrubcfg <<EOF
+root="$grubroot"
+insmod xzio
+insmod gzio
+insmod btrfs
+insmod ext2
+set timeout=1
+set default=0
+menuentry Cirros {
+ linux `echo $bootdir`/`get_cirros_kernel ${rootdir}/${bootdir}` root=/dev/xvda1 ro
+ initrd `echo $bootdir`/`get_cirros_initrd ${rootdir}/${bootdir}`
+}
+EOF
+ $SUDO mv $tmpgrubcfg ${rootdir}/${grubcfg}
+}
+
+function download_cirros_components() {
+ verbose_echo "Downloading cirros components"
+ . tests-configs/config-cirros_$RAISIN_ARCH
+ mkdir -p $CIRROS_DOWNLOADS
+ wget -q -c $CIRROS_KERNEL_URL -P $CIRROS_DOWNLOADS
+ wget -q -c $CIRROS_INITRD_URL -P $CIRROS_DOWNLOADS
+ wget -q -c $CIRROS_ROOTFS_URL -P $CIRROS_DOWNLOADS
+ wget -q -c $CIRROS_DISK_URL -P $CIRROS_DOWNLOADS
+}
+
+function set_up_cirros_kernel_initrd() {
+ local testdir=$1
+ mkdir -p $testdir
+ download_cirros_components
+ verbose_echo "Setting up kernel and initrd for cirros test"
+ cp $CIRROS_DOWNLOADS/$CIRROS_KERNEL_FILE $testdir
+ cp $CIRROS_DOWNLOADS/$CIRROS_INITRD_FILE $testdir
+}
+
+function set_up_cirros_rootfs() {
+ local testdir=$1
+ mkdir -p $testdir
+ download_cirros_components
+ verbose_echo "Setting up rootfs for cirros test"
+ cp $CIRROS_DOWNLOADS/$CIRROS_ROOTFS_FILE.gz $testdir
+ gunzip $testdir/$CIRROS_ROOTFS_FILE.gz
+ local cirros_rootfs_loop=`create_loop $testdir/$CIRROS_ROOTFS_FILE`
+ local cirros_rootfs_mntpt=`mktemp -d`
+ $SUDO mount $cirros_rootfs_loop $cirros_rootfs_mntpt
+ cirros_network_init $cirros_rootfs_mntpt
+ $SUDO umount $cirros_rootfs_mntpt
+ $SUDO rmdir $cirros_rootfs_mntpt
+ $SUDO losetup -d $cirros_rootfs_loop
+}
+
+function set_up_cirros_disk() {
+ local testdir=$1
+ mkdir -p $testdir
+ local grub_install=False
+ if [[ $# -gt 1 ]]
+ then
+ grub_install=$2
+ else
+ unset grub_install
+ fi
+ download_cirros_components
+ verbose_echo "Setting up disk for cirros test"
+ $QEMU_IMG convert -f qcow2 -O raw $CIRROS_DOWNLOADS/$CIRROS_DISK_FILE $testdir/$CIRROS_DISK_FILE
+ local cirros_disk_loop=`$SUDO $BASEDIR/scripts/lopartsetup $testdir/$CIRROS_DISK_FILE | head -1 | cut -d ":" -f 1`
+ local cirros_disk_mntpt=`mktemp -d`
+ $SUDO mount $cirros_disk_loop $cirros_disk_mntpt
+ cirros_network_init $cirros_disk_mntpt
+ if [[ -n $grub_install ]]
+ then
+ cirros_grub_cfg $cirros_disk_mntpt
+ fi
+ $SUDO umount $cirros_disk_mntpt
+ $SUDO rmdir $cirros_disk_mntpt
+ $SUDO losetup -d $cirros_disk_loop
+}
+
+function tear_down_cirros_test() {
+ testdir=$1
+ if [[ `$SUDO xl vm-list | grep -e "raisin-test" | wc -l` -gt 0 ]]
+ then
+ $SUDO xl destroy "raisin-test"
+ fi
+ verbose_echo "$PREPEND deleting environment of cirros test"
+ $SUDO rm -rf $testdir
+}
+
diff --git a/tests-configs/config-cirros_x86_32 b/tests-configs/config-cirros_x86_32
new file mode 100644
index 0000000..5402415
--- /dev/null
+++ b/tests-configs/config-cirros_x86_32
@@ -0,0 +1,13 @@
+CIRROS_ARCH=i386
+CIRROS_BASE_URL="https://download.cirros-cloud.net/"
+CIRROS_VERSION="0.3.5"
+CIRROS_DOWNLOADS=$BASEDIR/downloads
+CIRROS_KERNEL_FILE=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-kernel
+CIRROS_INITRD_FILE=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initramfs
+CIRROS_ROOTFS_FILE=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs.img
+CIRROS_DISK_FILE=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img
+CIRROS_KERNEL_URL=${CIRROS_BASE_URL}/${CIRROS_VERSION}/${CIRROS_KERNEL_FILE}
+CIRROS_INITRD_URL=${CIRROS_BASE_URL}/${CIRROS_VERSION}/${CIRROS_INITRD_FILE}
+CIRROS_ROOTFS_URL=${CIRROS_BASE_URL}/${CIRROS_VERSION}/${CIRROS_ROOTFS_FILE}.gz
+CIRROS_DISK_URL=${CIRROS_BASE_URL}/${CIRROS_VERSION}/${CIRROS_DISK_FILE}
+CIRROS_GRUB_CFG="(xen/xvda,msdos1)/boot/grub/grub.cfg"
diff --git a/tests-configs/config-cirros_x86_64 b/tests-configs/config-cirros_x86_64
new file mode 100644
index 0000000..72cf489
--- /dev/null
+++ b/tests-configs/config-cirros_x86_64
@@ -0,0 +1,13 @@
+CIRROS_ARCH=x86_64
+CIRROS_BASE_URL="https://download.cirros-cloud.net/"
+CIRROS_VERSION="0.3.5"
+CIRROS_DOWNLOADS=$BASEDIR/downloads
+CIRROS_KERNEL_FILE=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-kernel
+CIRROS_INITRD_FILE=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initramfs
+CIRROS_ROOTFS_FILE=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-rootfs.img
+CIRROS_DISK_FILE=cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-disk.img
+CIRROS_KERNEL_URL=${CIRROS_BASE_URL}/${CIRROS_VERSION}/${CIRROS_KERNEL_FILE}
+CIRROS_INITRD_URL=${CIRROS_BASE_URL}/${CIRROS_VERSION}/${CIRROS_INITRD_FILE}
+CIRROS_ROOTFS_URL=${CIRROS_BASE_URL}/${CIRROS_VERSION}/${CIRROS_ROOTFS_FILE}.gz
+CIRROS_DISK_URL=${CIRROS_BASE_URL}/${CIRROS_VERSION}/${CIRROS_DISK_FILE}
+CIRROS_GRUB_CFG="(xen/xvda,msdos1)/boot/grub/grub.cfg"
--
2.7.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
https://lists.xen.org/xen-devel
next prev parent reply other threads:[~2017-03-24 18:59 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-24 18:59 [raisin][PATCH 00/11] pygrub fix + cirros tests + lopartsetup fix Géza Gémes
2017-03-24 18:59 ` [PATCH 01/11] Fix installation of python libs Géza Gémes
2017-03-25 0:12 ` Stefano Stabellini
2017-03-24 18:59 ` Géza Gémes [this message]
2017-03-24 21:01 ` [PATCH 02/11] Introduce cirros tests Stefano Stabellini
2017-03-25 19:24 ` Gémes Géza
2017-03-24 18:59 ` [PATCH 03/11] Introduce cirros-separate-kernel-pv test Géza Gémes
2017-03-25 0:17 ` Stefano Stabellini
2017-03-24 18:59 ` [PATCH 04/11] Introduce cirros-pygrub-pv test Géza Gémes
2017-03-24 18:59 ` [PATCH 05/11] Introduce cirros-pvgrub2-pv test Géza Gémes
2017-03-24 18:59 ` [PATCH 06/11] Introduce cirros-qemu-hvm test Géza Gémes
2017-03-24 18:59 ` [PATCH 07/11] Introduce cirros-minios-stubdom-hvm test Géza Gémes
2017-03-24 18:59 ` [PATCH 08/11] Introduce cirros-qemu-pvhvm test Géza Gémes
2017-03-24 18:59 ` [PATCH 09/11] Introduce cirros-minios-stubdom-pvhvm test Géza Gémes
2017-03-24 18:59 ` [PATCH 10/11] Fix lopartsetup for util-linux >= 2.27.1 Géza Gémes
2017-03-25 0:26 ` Stefano Stabellini
2017-03-25 19:21 ` Gémes Géza
2017-03-24 18:59 ` [PATCH 11/11] Enable cirros tests in the default config Géza Gémes
2017-03-25 0:08 ` Stefano Stabellini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1490381976-22981-3-git-send-email-geza.gemes@gmail.com \
--to=geza.gemes@gmail.com \
--cc=george.dunlap@citrix.com \
--cc=sstabellini@kernel.org \
--cc=xen-devel@lists.xenproject.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).