From patchwork Sat Mar 18 14:00:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?R8OpbWVzIEfDqXph?= X-Patchwork-Id: 9632207 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 27C40601E9 for ; Sat, 18 Mar 2017 14:03:19 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 191AC2026B for ; Sat, 18 Mar 2017 14:03:19 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0DDED28454; Sat, 18 Mar 2017 14:03:19 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.6 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 804262026B for ; Sat, 18 Mar 2017 14:03:18 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpEuM-00044n-V0; Sat, 18 Mar 2017 14:00:38 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1cpEuM-00044g-8Z for xen-devel@lists.xenproject.org; Sat, 18 Mar 2017 14:00:38 +0000 Received: from [193.109.254.147] by server-3.bemta-6.messagelabs.com id 81/EA-27751-58D3DC85; Sat, 18 Mar 2017 14:00:37 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrIIsWRWlGSWpSXmKPExsVyMbThsG6L7dk Ig4/PFCy+b5nM5MDocfjDFZYAxijWzLyk/IoE1oydD5eyF7TrVaxf0MPawLhCrYuRi0NIYBaj xL9La5lAHBaBWawSDxYuZgdxJAS2sUo8OziZuYuRE8iJkZi4Yx8bhF0tsbx9OVAHB1C7ssSjj TYQk3qZJI4/mMEGEmcTsJe48VYWpFxEQEni3qrJTCA2s0ChxOn9K9hBbGEBXYlTU++wgtgsAq oS25ccB6vhFXCWaNswB2qVnMTNc51gJ3AKuEisvDuJBcQWAqrp6DzCClEvKHFy5hMWkLXMAuo S6+cJQaySl2jeOpt5AqPwLCRVsxCqZiGpWsDIvIpRozi1qCy1SNfYQC+pKDM9oyQ3MTNH19DA TC83tbg4MT01JzGpWC85P3cTIzDIGYBgB+PftYGHGCU5mJREeT/PPRghxJeUn1KZkVicEV9Um pNafIhRhoNDSYKX7zRQTrAoNT21Ii0zBxhvMGkJDh4lEd6dp4DSvMUFibnFmekQqVOMlhwPTu 16w8Txqf8wkNxx9MgbJiGWvPy8VClx3jsgDQIgDRmleXDjYCnhEqOslDAvI9CBQjwFqUW5mSW o8q8YxTkYlYR5v4NM4cnMK4Hb+groICagg6bxgR1UkoiQkmpgFFat3blXzux5+LRzoq8Wh5/o KBbL2bw345GFgsdx7fsLWLda6TMFe61IPfFDTMjTheflfFGfORy15euuxe88fEKug/Fm8W99I 4lNCueb512umb3Cv0O0U/nCq1S/aQ1mNteZWRyvzOp5vNDk8ELf9UurOtdc/R3RdOfXA+Xu64 dSt95a8HnJayWW4oxEQy3mouJEAKxWqP0EAwAA X-Env-Sender: geza.gemes@gmail.com X-Msg-Ref: server-8.tower-27.messagelabs.com!1489845636!82155130!1 X-Originating-IP: [209.85.128.195] X-SpamReason: No, hits=0.0 required=7.0 tests=UPPERCASE_25_50 X-StarScan-Received: X-StarScan-Version: 9.2.3; banners=-,-,- X-VirusChecked: Checked Received: (qmail 51638 invoked from network); 18 Mar 2017 14:00:36 -0000 Received: from mail-wr0-f195.google.com (HELO mail-wr0-f195.google.com) (209.85.128.195) by server-8.tower-27.messagelabs.com with AES128-GCM-SHA256 encrypted SMTP; 18 Mar 2017 14:00:36 -0000 Received: by mail-wr0-f195.google.com with SMTP id u108so12669807wrb.2 for ; Sat, 18 Mar 2017 07:00:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Zp2LPYr5ZHd9dtmiLuAen3XL1BlX+3ELMoxAGcBk+4g=; b=lyGjogaX0zKBA3GPtU/VD3REP9luW1ncBFjqY/ckE0cDCXC6p9xdbWRE/cGbQ9Ygfn sFJ8W4oo+LzA42HWMerxSNPh5rdMFbtN2QXD5WrmSJnZ/L32j3hmwCtiDtrq5X9fb5Pg mfqk2EnVOVjpMG09PRMRtrhmwlGpfpsIotAYxlnYcV4H1RMvJQuP/EcUO7zyoOeUoGfL g+HHtlCo+mkB+ojlzieDF9amt712vMEGFsBFs0TfUn91o3/4U6EXxlxXlxUIH33vDvEH tfpFt4jHmliIzKXF5nJfMTGA9GiUBJwCKNY5tphYavgV+AU93fodQD5gqOQa7uLzG2c3 B9MQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=Zp2LPYr5ZHd9dtmiLuAen3XL1BlX+3ELMoxAGcBk+4g=; b=o15NTwMS3hRWgU2VKWACSFJwmmp1GTzolN3qVlwyAf5SJAcoWO99q9hAlzceYGxJ3s ISqT0ZTPX/e7avUR2Vztc97LhcRtRqtG+Z1UgYwwhFRBBjQwjTEvSv47L/J4sYJElEcj P7OEK1QEbjmTE3ZOLOn7qfJUjHVOx90NyQ8JSjHSBzLhJySdKegZs+OXt6yiceVeJaJH 4KFs8Vf7q09ZT0F2TXO1tcSebOESwhc/uUIL+3cQVWGCyMgmZC5BKX07jjPhvH1oUQAd e1Ww91FqsmI/Q+aMRiQ+AiAK3ibCBAKb92SWAJmAqFpe8h0PmipfRsr4ToGPsieJ/piB +gxQ== X-Gm-Message-State: AFeK/H2zujCcd1aj36O8UTZ8JVjz4+NFF10bWvwb7OU8dyJcUkzABGFrEUy4dWeeTQ85ZQ== X-Received: by 10.223.177.151 with SMTP id q23mr17033680wra.65.1489845636133; Sat, 18 Mar 2017 07:00:36 -0700 (PDT) Received: from kag.kagdom.hu (51B7A248.dsl.pool.telekom.hu. [81.183.162.72]) by smtp.gmail.com with ESMTPSA id r2sm6342652wmb.26.2017.03.18.07.00.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 18 Mar 2017 07:00:35 -0700 (PDT) From: =?UTF-8?q?G=C3=A9za=20G=C3=A9mes?= To: xen-devel@lists.xenproject.org Date: Sat, 18 Mar 2017 15:00:03 +0100 Message-Id: <1489845611-6322-3-git-send-email-geza.gemes@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1489845611-6322-1-git-send-email-geza.gemes@gmail.com> References: <1489845611-6322-1-git-send-email-geza.gemes@gmail.com> MIME-Version: 1.0 Cc: sstabellini@kernel.org, george.dunlap@citrix.com, =?UTF-8?q?G=C3=A9za=20G=C3=A9mes?= Subject: [Xen-devel] [PATCH 02/10] Introduce cirros tests X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xen.org Sender: "Xen-devel" X-Virus-Scanned: ClamAV using ClamSMTP Add support for using cirros images in raisin tests Signed-off-by: Géza Gémes --- configs/config-cirros | 44 ++++++++++++++++++++++ defconfig | 2 + lib/common-tests.sh | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 148 insertions(+) create mode 100644 configs/config-cirros diff --git a/configs/config-cirros b/configs/config-cirros new file mode 100644 index 0000000..fa2823e --- /dev/null +++ b/configs/config-cirros @@ -0,0 +1,44 @@ +CIRROS_BASE_URL="https://download.cirros-cloud.net/" +CIRROS_VERSION="0.3.5" + +source `pwd`/lib/common-functions.sh +get_arch +case $RAISIN_ARCH in + x86_64) + CIRROS_ARCH=x86_64 + ;; + x86_32) + CIRROS_ARCH=i386 + ;; + *) + echo $PREPEND cirros tests only valid on x86, 32 or 64 bit + exit 1 +esac + +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" + +set +e +QEMU_IMG=`which qemu-img` +set -e +if [[ -z "$QEMU_IMG" ]] +then + QEMU_IMG="/usr/lib/xen/bin/qemu-img" +fi + +set +e +PVGRUB=`which grub-${CIRROS_ARCH}-xen` +set -e +if [[ -z "$PVGRUB" ]] +then + PVGRUB="/usr/lib/xen/boot/grub-${CIRROS_ARCH}-xen" +fi + diff --git a/defconfig b/defconfig index f8ef398..111554e 100644 --- a/defconfig +++ b/defconfig @@ -32,3 +32,5 @@ GIT_TRANSPORT="git" ## All tests: busybox-pv busybox-hvm ## ENABLED_TESTS is the list of test run by raise test ENABLED_TESTS="busybox-pv busybox-hvm" + +. configs/config-cirros diff --git a/lib/common-tests.sh b/lib/common-tests.sh index d346af4..79815ce 100644 --- a/lib/common-tests.sh +++ b/lib/common-tests.sh @@ -178,3 +178,105 @@ function get_host_initrd() { exit 1 fi } + +function cirros_network_init() { + rootdir=$1 + # Configure static ip + $SUDO sed -i -e 's/iface eth0 inet dhcp/iface eth0 inet static/' ${rootdir}/etc/network/interfaces + $SUDO sed -i -e '/iface eth0 inet static/a\ address 169.254.0.2' ${rootdir}/etc/network/interfaces + $SUDO sed -i -e '/address/a\ network 169.254.0.0' ${rootdir}/etc/network/interfaces + $SUDO sed -i -e '/network/a\ broadcast 169.254.0.255' ${rootdir}/etc/network/interfaces + $SUDO sed -i -e '/broadcast/a\ netmask 255.255.255.0' ${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 + grubcfg="`echo $CIRROS_GRUB_CFG | cut -d ')' -f 2`" + grubdir=`dirname $grubcfg` + bootdir=`dirname $grubdir` + tmpgrubcfg=`mktemp` + cat > $tmpgrubcfg <