From patchwork Tue Jul 25 11:57:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anthony PERARD X-Patchwork-Id: 9861921 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 165A8602B1 for ; Tue, 25 Jul 2017 12:19:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0D4EE27E63 for ; Tue, 25 Jul 2017 12:19:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0232827F2B; Tue, 25 Jul 2017 12:19:01 +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=-4.2 required=2.0 tests=BAYES_00, RCVD_IN_DNSWL_MED 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 4259B27E63 for ; Tue, 25 Jul 2017 12:19:01 +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 1dZylG-0004jQ-7G; Tue, 25 Jul 2017 12:16:26 +0000 Received: from mail6.bemta6.messagelabs.com ([193.109.254.103]) by lists.xenproject.org with esmtp (Exim 4.84_2) (envelope-from ) id 1dZylE-0004ix-Lc for xen-devel@lists.xenproject.org; Tue, 25 Jul 2017 12:16:24 +0000 Received: from [85.158.143.35] by server-8.bemta-6.messagelabs.com id F0/FC-09901-79637795; Tue, 25 Jul 2017 12:16:23 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFlrEIsWRWlGSWpSXmKPExsXitHRDpO50s/J Ig5aNnBbft0xmcmD0OPzhCksAYxRrZl5SfkUCa8b93V+ZC045VLxo/8/WwLjarIuRk0NCwF/i 19Uz7CA2m4CBxIrpVxm7GDk4RARUJG7vNQAJMwtESLy4sYoNxBYWsJXYNnkmWDmLgKrEm8Pzm EBsXgF7iYZ1h5khRspLTOydxghicwLFf+6/DlYvJGAnsXnnBihbTeLGwmUsEL2CEidnPmGB2C UhcfDFC+YJjLyzkKRmIUktYGRaxahRnFpUllqka2iml1SUmZ5RkpuYmaNraGCml5taXJyYnpq TmFSsl5yfu4kRGDoMQLCD8f7GgEOMkhxMSqK833TLI4X4kvJTKjMSizPii0pzUosPMcpwcChJ 8CaZAuUEi1LTUyvSMnOAQQyTluDgURLhPWcClOYtLkjMLc5Mh0idYrTn2LB6/Rcmjjm/dwDJV xP+f2PiaPr+8TuTEEtefl6qlDivAMhUAZC2jNI8uKGwqLvEKCslzMsIdKYQT0FqUW5mCar8K0 ZxDkYlYV4fkCk8mXklcLtfAZ3FBHTWnBmlIGeVJCKkpBoY156zvLXMa1PllWqfeIbli4K+O25 vMBY33fyc+ePu8or3IfGTFAULJ1a8s2p0+R4n0aytdvZMqOEdRrnOjaa2x6JuFVfUJwrX5ZzO U3A5I7XA9cvfoHmTJy9WOJMS7mb32GHWZf21Tx+eMJf+dmh//ATlJ3e3VRjNrtpSsdfaJmpxR sXbxwfMlViKMxINtZiLihMBqcQO77UCAAA= X-Env-Sender: prvs=372f2a2d8=anthony.perard@citrix.com X-Msg-Ref: server-7.tower-21.messagelabs.com!1500984980!74878558!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: 9.4.25; banners=-,-,- X-VirusChecked: Checked Received: (qmail 26553 invoked from network); 25 Jul 2017 12:16:22 -0000 Received: from smtp.citrix.com (HELO SMTP.CITRIX.COM) (66.165.176.89) by server-7.tower-21.messagelabs.com with RC4-SHA encrypted SMTP; 25 Jul 2017 12:16:22 -0000 X-IronPort-AV: E=Sophos;i="5.40,411,1496102400"; d="scan'208";a="432847704" From: Anthony PERARD To: Date: Tue, 25 Jul 2017 12:57:57 +0100 Message-ID: <20170725115759.21895-23-anthony.perard@citrix.com> X-Mailer: git-send-email 2.13.3 In-Reply-To: <20170725115759.21895-1-anthony.perard@citrix.com> References: <20170725115759.21895-1-anthony.perard@citrix.com> MIME-Version: 1.0 Cc: Anthony PERARD , Ian Jackson Subject: [Xen-devel] [OSSTEST PATCH v13 22/24] New branch openstack-ocata 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 Testing of the Ocata stable branch of OpenStack against Xen unstable. OpenStack have many different repo which should be in sync, so we should attempd to grab the revisions of the stable branch of every OpenStack tree, but for now, the runvars REVISION_* of tree other than nova is set to "origin/stable/ocata", except Tempest does not have stable branch and should be able to test any OpenStack version. Signed-off-by: Anthony PERARD --- ap-common | 19 +++++++++++++++++++ ap-fetch-version | 6 ++++++ ap-fetch-version-old | 8 ++++++++ ap-print-url | 3 +++ ap-push | 7 +++++++ cr-daily-branch | 31 +++++++++++++++++++++++++++++++ cr-for-branches | 2 +- cri-common | 1 + 8 files changed, 76 insertions(+), 1 deletion(-) diff --git a/ap-common b/ap-common index bc7c03c..72496fd 100644 --- a/ap-common +++ b/ap-common @@ -54,6 +54,24 @@ : ${PUSH_TREE_OVMF:=$XENBITS:/home/xen/git/osstest/ovmf.git} : ${BASE_TREE_OVMF:=git://xenbits.xen.org/osstest/ovmf.git} +define_openstack_trees() { + local openstack_trees=(cinder glance keystone neutron nova requirements + tempest) + local tree + local url + + : ${GIT_OPENSTACK_ORG:=git://git.openstack.org} + : ${TREE_OPENSTACK_DEVSTACK:=$GIT_OPENSTACK_ORG/openstack-dev/devstack.git} + for tree in "${openstack_trees[@]}"; do + url=$GIT_OPENSTACK_ORG/openstack/$tree.git + eval ": \${TREE_OPENSTACK_${tree^^}:=$url}" + done +} + +define_openstack_trees +: ${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 +100,7 @@ fi : ${LOCALREV_SEABIOS:=daily-cron.$branch} : ${LOCALREV_OVMF:=daily-cron.$branch} : ${LOCALREV_XTF:=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 a107c93..1d86351 100755 --- a/ap-fetch-version +++ b/ap-fetch-version @@ -106,6 +106,12 @@ ovmf) repo_tree_rev_fetch_git ovmf \ $TREE_OVMF_UPSTREAM master $LOCALREV_OVMF ;; +openstack-ocata) + openstack_release=${branch#openstack-} + repo_tree_rev_fetch_git "openstack-nova" \ + "$TREE_OPENSTACK_NOVA" "stable/$openstack_release" \ + "$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 3cbc176..a0b8c08 100755 --- a/ap-fetch-version-old +++ b/ap-fetch-version-old @@ -35,6 +35,7 @@ check_ap_fetch_placeholders : ${BASE_LOCALREV_XTF:=daily-cron.$branch.old} : ${BASE_LOCALREV_OVMF:=daily-cron.$branch.old} : ${BASE_TAG_LIBVIRT:=xen-tested-master} +: ${BASE_LOCALREV_OPENSTACK_NOVA:=daily-cron.$branch.old} if info_linux_tree "$branch"; then repo_tree_rev_fetch_git linux \ @@ -114,6 +115,13 @@ ovmf) repo_tree_rev_fetch_git ovmf \ $BASE_TREE_OVMF xen-tested-master $BASE_LOCALREV_OVMF ;; +openstack-ocata) + openstack_release="${branch##*-}" + repo_tree_rev_fetch_git openstack-nova \ + "$BASE_TREE_OPENSTACK_NOVA" \ + "xen-tested-stable-$openstack_release" \ + "$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 93c14b3..cfba1d4 100755 --- a/ap-print-url +++ b/ap-print-url @@ -67,6 +67,9 @@ ovmf) osstest) echo none:; ;; +openstack-ocata) + echo $TREE_OPENSTACK_NOVA + ;; *) echo >&2 "branch $branch ?" exit 1 diff --git a/ap-push b/ap-push index a27ccc2..e5c061a 100755 --- a/ap-push +++ b/ap-push @@ -41,6 +41,7 @@ TREE_RUMPRUN=$PUSH_TREE_RUMPRUN TREE_SEABIOS=$PUSH_TREE_SEABIOS TREE_OVMF=$PUSH_TREE_OVMF TREE_XTF=$PUSH_TREE_XTF +TREE_OPENSTACK_NOVA=$PUSH_TREE_OPENSTACK_NOVA if info_linux_tree "$branch"; then cd $repos/linux @@ -129,6 +130,12 @@ ovmf) cd $repos/ovmf git push $TREE_OVMF $revision:refs/heads/xen-tested-master ;; +openstack-ocata) + cd $repos/openstack-nova + openstack_release=${branch#openstack-} + git push $TREE_OPENSTACK_NOVA \ + $revision:refs/heads/xen-tested-stable-$openstack_release + ;; 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 39483cd..c3de124 100755 --- a/cr-daily-branch +++ b/cr-daily-branch @@ -207,6 +207,33 @@ 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-ocata OPENSTACK_NOVA + export REVISION_OPENSTACK_NOVA +fi +# Set REVISION for every tree that openstack is going to use and that have a +# stable branch (tempest does not) +determine_openstack_version() { + local openstack_tree="$1" + local openstack_release + local openstack_branch + + if ! eval [ "x\$REVISION_OPENSTACK_${openstack_tree^^}" = x ]; then + return + fi + case "$branch" in + openstack-ocata) + openstack_release=${branch#openstack-} + openstack_branch="origin/stable/${branch##*-}" + eval "REVISION_OPENSTACK_${openstack_tree^^}=$openstack_branch" + export "REVISION_OPENSTACK_${openstack_tree^^}" + ;; + esac +} +for openstack_tree in cinder devstack glance keystone neutron requirements; do + determine_openstack_version "$openstack_tree" +done + case "$tree" in xen) @@ -255,6 +282,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 a691273..ed76d70 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-4.7-testing xen-4.8-testing xen-4.9-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 qemu-upstream-4.7-testing qemu-upstream-4.8-testing qemu-upstream-4.9-testing linux-linus linux-4.9 linux-4.1 linux-3.18 linux-3.16 linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf xtf ${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-4.7-testing xen-4.8-testing xen-4.9-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 qemu-upstream-4.7-testing qemu-upstream-4.8-testing qemu-upstream-4.9-testing linux-linus linux-4.9 linux-4.1 linux-3.18 linux-3.16 linux-3.14 linux-3.10 linux-3.4 linux-arm-xen seabios ovmf xtf openstack-ocata ${EXTRA_BRANCHES}} export BRANCHES fetchwlem=$wlem diff --git a/cri-common b/cri-common index 903fb4e..751a362 100644 --- a/cri-common +++ b/cri-common @@ -82,6 +82,7 @@ select_xenbranch () { ovmf) tree=ovmf; xenbranch=xen-unstable ;; distros-*|examine) tree=none; xenbranch=xen-unstable ;; osstest) tree=osstest; xenbranch=xen-unstable ;; + openstack-ocata) tree=openstack-nova; xenbranch=xen-unstable ;; esac if [ "x$tree" = xlinux ]; then linuxbranch=$branch