From patchwork Fri Feb 5 16:26:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 8236931 Return-Path: X-Original-To: patchwork-xen-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 138349FB33 for ; Fri, 5 Feb 2016 16:30:16 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C6422201EC for ; Fri, 5 Feb 2016 16:30:14 +0000 (UTC) Received: from lists.xen.org (lists.xenproject.org [50.57.142.19]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 715152015E for ; Fri, 5 Feb 2016 16:30:13 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=lists.xen.org) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aRjDw-0005wU-3C; Fri, 05 Feb 2016 16:27:08 +0000 Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1aRjDu-0005w6-Sx for xen-devel@lists.xen.org; Fri, 05 Feb 2016 16:27:07 +0000 Received: from [85.158.137.68] by server-13.bemta-3.messagelabs.com id 98/A2-31443-A5DC4B65; Fri, 05 Feb 2016 16:27:06 +0000 X-Env-Sender: prvs=836b819b4=anthony.perard@citrix.com X-Msg-Ref: server-4.tower-31.messagelabs.com!1454689623!11006800!2 X-Originating-IP: [66.165.176.89] X-SpamReason: No, hits=0.0 required=7.0 tests=sa_preprocessor: VHJ1c3RlZCBJUDogNjYuMTY1LjE3Ni44OSA9PiAyMDMwMDc=\n, received_headers: No Received headers X-StarScan-Received: X-StarScan-Version: 7.35.1; banners=-,-,- X-VirusChecked: Checked Received: (qmail 59767 invoked from network); 5 Feb 2016 16:27:05 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-4.tower-31.messagelabs.com with RC4-SHA encrypted SMTP; 5 Feb 2016 16:27:05 -0000 X-IronPort-AV: E=Sophos;i="5.22,401,1449532800"; d="scan'208";a="329958393" From: Anthony PERARD To: Xen Devel Date: Fri, 5 Feb 2016 16:26:53 +0000 Message-ID: <1454689613-12814-4-git-send-email-anthony.perard@citrix.com> X-Mailer: git-send-email 2.7.0 In-Reply-To: <1454689613-12814-1-git-send-email-anthony.perard@citrix.com> References: <1454689613-12814-1-git-send-email-anthony.perard@citrix.com> MIME-Version: 1.0 X-DLP: MIA1 Cc: Anthony PERARD , Ian Jackson , Ian Campbell Subject: [Xen-devel] [PATCH v5 3/3] Create a flight to test OpenStack with xen-unstable and libvirt X-BeenThere: xen-devel@lists.xen.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP This patch should create a flight "openstack-nova", with those jobs: build-amd64 build-amd64-xsm build-amd64-pvops build-amd64-libvirt test-amd64-amd64-devstack test-amd64-amd64-devstack-xsm About the runvars revision_* of test-*-*-devstack: only REVISION_OPENSTACK_NOVA is set, the others are unset. Empty revision_* runvar would clone the default branch, which should be master for every openstack repos. Signed-off-by: Anthony PERARD --- Change in V5: - rename flight openstack to openstack-nova - add -xsm variant of the test - run test-devstack only on openstack-nova flight Change in V4: - also skip build-*-oldkern in make flight - fix select_xenbranch - set revision_*=$REVISION_OPENSTACK_* in make-flight (was revision_*=master before) only REVISION_OPENSTACK_NOVA is set, the others are unset. empty revision_* runvar would clone the default branch, which should be master for every openstack repos Change in V3: - Switch to "track" Nova tree instead of devstack. Nova is the service we care about from a Xen point of view. Also it is updated much more often than devstack. - Use TREE_OPENSTACK_ as prefix for all trees variables. - Change the filter, keep only *-devstack jobs. - Add stuff into ./ap-push - Add stuff into ./cr-daily-branch. - Add 'openstack' into ./cr-for-branches. --- ap-common | 12 ++++++++++++ ap-fetch-version | 4 ++++ ap-fetch-version-old | 5 +++++ ap-print-url | 3 +++ ap-push | 5 +++++ cr-daily-branch | 8 ++++++++ cr-for-branches | 2 +- cri-common | 1 + make-flight | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 9 files changed, 91 insertions(+), 1 deletion(-) diff --git a/ap-common b/ap-common index 19c7580..5ea0891 100644 --- a/ap-common +++ b/ap-common @@ -55,6 +55,17 @@ : ${PUSH_TREE_OVMF:=$XENBITS:/home/xen/git/osstest/ovmf.git} : ${BASE_TREE_OVMF:=git://xenbits.xen.org/osstest/ovmf.git} +: ${GIT_OPENSTACK_ORG:=git://git.openstack.org} +: ${TREE_OPENSTACK_CINDER:=$GIT_OPENSTACK_ORG/openstack/cinder.git} +: ${TREE_OPENSTACK_DEVSTACK:=$GIT_OPENSTACK_ORG/openstack-dev/devstack.git} +: ${TREE_OPENSTACK_GLANCE:=$GIT_OPENSTACK_ORG/openstack/glance.git} +: ${TREE_OPENSTACK_KEYSTONE:=$GIT_OPENSTACK_ORG/openstack/keystone.git} +: ${TREE_OPENSTACK_NOVA:=$GIT_OPENSTACK_ORG/openstack/nova.git} +: ${TREE_OPENSTACK_REQUIREMENTS:=$GIT_OPENSTACK_ORG/openstack/requirements.git} +: ${TREE_OPENSTACK_TEMPEST:=$GIT_OPENSTACK_ORG/openstack/tempest.git} +: ${PUSH_TREE_OPENSTACK_NOVA:=$XENBITS:/home/xen/git/osstest/openstack-nova.git} +: ${BASE_TREE_OPENSTACK_NOVA:=git://xenbits.xen.org/osstest/openstack-nova.git} + : ${TREE_LINUXFIRMWARE:=git://xenbits.xen.org/osstest/linux-firmware.git} : ${PUSH_TREE_LINUXFIRMWARE:=$XENBITS:/home/osstest/ext/linux-firmware.git} : ${UPSTREAM_TREE_LINUXFIRMWARE:=$GIT_KERNEL_ORG/pub/scm/linux/kernel/git/firmware/linux-firmware.git} @@ -82,6 +93,7 @@ fi : ${LOCALREV_RUMPUSERXEN:=daily-cron.$branch} : ${LOCALREV_SEABIOS:=daily-cron.$branch} : ${LOCALREV_OVMF:=daily-cron.$branch} +: ${LOCALREV_OPENSTACK_NOVA:=daily-cron.$branch} : ${TREEBASE_LINUX_XCP:=http://hg.uk.xensource.com/carbon/trunk/linux-2.6.27} diff --git a/ap-fetch-version b/ap-fetch-version index a7b658b..6d98de4 100755 --- a/ap-fetch-version +++ b/ap-fetch-version @@ -99,6 +99,10 @@ ovmf) repo_tree_rev_fetch_git ovmf \ $TREE_OVMF_UPSTREAM master $LOCALREV_OVMF ;; +openstack-nova) + repo_tree_rev_fetch_git openstack-nova \ + $TREE_OPENSTACK_NOVA master $LOCALREV_OPENSTACK_NOVA + ;; osstest) if [ "x$OSSTEST_USE_HEAD" = "xy" ] ; then git update-ref -m "Arranging to test HEAD" \ diff --git a/ap-fetch-version-old b/ap-fetch-version-old index e2c6b3b..c832aca 100755 --- a/ap-fetch-version-old +++ b/ap-fetch-version-old @@ -33,6 +33,7 @@ check_ap_fetch_placeholders : ${BASE_LOCALREV_RUMPUSERXEN:=daily-cron.$branch.old} : ${BASE_LOCALREV_SEABIOS:=daily-cron.$branch.old} : ${BASE_LOCALREV_OVMF:=daily-cron.$branch.old} +: ${BASE_LOCALREV_OPENSTACK_NOVA:=daily-cron.$branch.old} if info_linux_tree "$branch"; then repo_tree_rev_fetch_git linux \ @@ -105,6 +106,10 @@ ovmf) repo_tree_rev_fetch_git ovmf \ $BASE_TREE_OVMF xen-tested-master $BASE_LOCALREV_OVMF ;; +openstack-nova) + repo_tree_rev_fetch_git openstack-nova \ + $BASE_TREE_OPENSTACK_NOVA xen-tested-master $BASE_LOCALREV_OPENSTACK_NOVA + ;; osstest) if [ "x$OSSTEST_USE_HEAD" != "xy" ] ; then git fetch -f $HOME/testing.git production:ap-fetch diff --git a/ap-print-url b/ap-print-url index 4088852..423556e 100755 --- a/ap-print-url +++ b/ap-print-url @@ -64,6 +64,9 @@ ovmf) osstest) echo none:; ;; +openstack-nova) + echo $TREE_OPENSTACK_NOVA + ;; *) echo >&2 "branch $branch ?" exit 1 diff --git a/ap-push b/ap-push index 8def652..aeb7d75 100755 --- a/ap-push +++ b/ap-push @@ -40,6 +40,7 @@ TREE_LIBVIRT=$PUSH_TREE_LIBVIRT TREE_RUMPUSERXEN=$PUSH_TREE_RUMPUSERXEN TREE_SEABIOS=$PUSH_TREE_SEABIOS TREE_OVMF=$PUSH_TREE_OVMF +TREE_OPENSTACK_NOVA=$PUSH_TREE_OPENSTACK_NOVA if info_linux_tree "$branch"; then cd $repos/linux @@ -120,6 +121,10 @@ ovmf) cd $repos/ovmf git push $TREE_OVMF $revision:refs/heads/xen-tested-master ;; +openstack-nova) + cd $repos/openstack-nova + git push $TREE_OPENSTACK_NOVA $revision:refs/heads/xen-tested-master + ;; osstest) git push $HOME/testing.git $revision:production if [ x"$TREEBRANCH_OSSTEST_UPSTREAM" != x ] ; then diff --git a/cr-daily-branch b/cr-daily-branch index 364238c..5e371b0 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -197,6 +197,10 @@ if [ "x$REVISION_LINUXFIRMWARE" = x ]; then determine_version REVISION_LINUXFIRMWARE linuxfirmware LINUXFIRMWARE export REVISION_LINUXFIRMWARE fi +if [ "x$REVISION_OPENSTACK_NOVA" = x ]; then + determine_version REVISION_OPENSTACK_NOVA openstack-nova OPENSTACK_NOVA + export REVISION_OPENSTACK_NOVA +fi if [ "x$branch" != "xxen-unstable" ]; then export REVISION_LINUX_OLD=disable @@ -246,6 +250,10 @@ ovmf) realtree=ovmf NEW_REVISION=$REVISION_OVMF ;; +openstack-nova) + realtree=openstack-nova + NEW_REVISION=$REVISION_OPENSTACK_NOVA + ;; *) NEW_REVISION='' wantpush=false diff --git a/cr-for-branches b/cr-for-branches index 757045d..a07d0d5 100755 --- a/cr-for-branches +++ b/cr-for-branches @@ -31,7 +31,7 @@ scriptoptions="$1"; shift LOGFILE=tmp/cr-for-branches.log export LOGFILE -: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-4.5-testing xen-4.6-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing qemu-upstream-4.5-testing qemu-upstream-4.6-testing linux-4.1 linux-3.18 linux-3.16 linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf ${EXTRA_BRANCHES}} +: ${BRANCHES:=osstest xen-4.0-testing xen-4.1-testing xen-4.2-testing xen-4.3-testing xen-4.4-testing xen-4.5-testing xen-4.6-testing xen-unstable qemu-mainline qemu-upstream-unstable qemu-upstream-4.2-testing qemu-upstream-4.3-testing qemu-upstream-4.4-testing qemu-upstream-4.5-testing qemu-upstream-4.6-testing linux-4.1 linux-3.18 linux-3.16 linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf openstack-nova ${EXTRA_BRANCHES}} export BRANCHES fetchwlem=$wlem diff --git a/cri-common b/cri-common index 6dfe8df..7eaea0d 100644 --- a/cri-common +++ b/cri-common @@ -79,6 +79,7 @@ select_xenbranch () { ovmf) tree=ovmf; xenbranch=xen-unstable ;; distros-*) tree=none; xenbranch=xen-unstable ;; osstest) tree=osstest; xenbranch=xen-unstable ;; + openstack-nova) tree=openstack-nova; xenbranch=xen-unstable ;; esac if [ "x$tree" = xlinux ]; then linuxbranch=$branch diff --git a/make-flight b/make-flight index 6b2b3ea..442d24e 100755 --- a/make-flight +++ b/make-flight @@ -119,6 +119,17 @@ job_create_test_filter_callback () { *) return 1;; esac ;; + openstack-nova) + case "$job" in + *-devstack) ;; + *-devstack-xsm) ;; + *) return 1;; + esac + case $dom0arch in + amd64) ;; + *) return 1;; + esac + ;; *) case "$job" in *-qemuu-*) @@ -150,6 +161,12 @@ arch_branch_filter_callback () { rumpuserxen) return 1;; seabios) return 1;; ovmf) return 1;; + openstack-nova) return 1;; + esac + ;; + i386) + case "$branch" in + openstack-nova) return 1;; esac ;; i386|amd64) @@ -534,6 +551,39 @@ do_pv_debian_tests () { $endfmt$dom0arch } +do_openstack_tests () { + local xsms=$(xenbranch_xsm_variants) + + if [ $dom0arch != amd64 ]; then + return + fi + if [ $branch != openstack-nova ]; then + return + fi + + for xsm in $xsms ; do + job_create_test test-$xenarch$kern-$dom0arch-devstack \ + test-devstack libvirt $xenarch $dom0arch \ + tree_cinder=$TREE_OPENSTACK_CINDER \ + tree_devstack=$TREE_OPENSTACK_DEVSTACK \ + tree_glance=$TREE_OPENSTACK_GLANCE \ + tree_keystone=$TREE_OPENSTACK_KEYSTONE \ + tree_nova=$TREE_OPENSTACK_NOVA \ + tree_requirements=$TREE_OPENSTACK_REQUIREMENTS \ + tree_tempest=$TREE_OPENSTACK_TEMPEST \ + revision_nova=$REVISION_OPENSTACK_NOVA \ + revision_cinder=$REVISION_OPENSTACK_CINDER \ + revision_devstack=$REVISION_OPENSTACK_DEVSTACK \ + revision_glance=$REVISION_OPENSTACK_GLANCE \ + revision_keystone=$REVISION_OPENSTACK_KEYSTONE \ + revision_requirements=$REVISION_OPENSTACK_REQUIREMENTS \ + revision_tempest=$REVISION_OPENSTACK_TEMPEST \ + dom0_mem=4000 \ + enable_xsm=$xsm \ + all_hostflags=$most_hostflags + done +} + test_matrix_do_one () { do_pv_debian_tests @@ -679,6 +729,8 @@ test_matrix_do_one () { do_pygrub_tests do_pvgrub_tests + + do_openstack_tests } if [ x$buildflight = x ]; then