From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anthony PERARD Subject: [PATCH OSSTEST 4/4] Create a flight to test OpenStack with xen-unstable and libvirt. Date: Thu, 16 Jul 2015 12:18:39 +0100 Message-ID: <1437045519-13914-5-git-send-email-anthony.perard@citrix.com> References: <1437045519-13914-1-git-send-email-anthony.perard@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1437045519-13914-1-git-send-email-anthony.perard@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: Anthony PERARD , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org Signed-off-by: Anthony PERARD --- ap-common | 4 ++++ ap-fetch-version | 4 ++++ ap-fetch-version-old | 5 +++++ ap-print-url | 3 +++ cri-common | 1 + make-flight | 17 +++++++++++++++++ mfi-common | 7 +++++++ 7 files changed, 41 insertions(+) diff --git a/ap-common b/ap-common index dfeab9e..cb2e91a 100644 --- a/ap-common +++ b/ap-common @@ -57,6 +57,9 @@ : ${PUSH_TREE_OVMF:=$XENBITS:/home/xen/git/osstest/ovmf.git} : ${BASE_TREE_OVMF:=git://xenbits.xen.org/osstest/ovmf.git} +: ${TREE_DEVSTACK:=git://git.openstack.org/openstack-dev/devstack.git} +#: ${BASE_TREE_DEVSTACK:=git://xenbits.xen.org/openstack-dev/devstack.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} @@ -84,6 +87,7 @@ fi : ${LOCALREV_RUMPUSERXEN:=daily-cron.$branch} : ${LOCALREV_SEABIOS:=daily-cron.$branch} : ${LOCALREV_OVMF:=daily-cron.$branch} +: ${LOCALREV_DEVSTACK:=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 8b41acf..9aba511 100755 --- a/ap-fetch-version +++ b/ap-fetch-version @@ -89,6 +89,10 @@ ovmf) repo_tree_rev_fetch_git ovmf \ $TREE_OVMF_UPSTREAM master $LOCALREV_OVMF ;; +openstack) + repo_tree_rev_fetch_git devstack \ + $TREE_DEVSTACK master $LOCALREV_DEVSTACK + ;; 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 0b4739b..d12c753 100755 --- a/ap-fetch-version-old +++ b/ap-fetch-version-old @@ -31,6 +31,7 @@ select_xenbranch : ${BASE_LOCALREV_RUMPUSERXEN:=daily-cron.$branch.old} : ${BASE_LOCALREV_SEABIOS:=daily-cron.$branch.old} : ${BASE_LOCALREV_OVMF:=daily-cron.$branch.old} +: ${BASE_LOCALREV_DEVSTACK:=daily-cron.$branch.old} : ${BASE_TREE_QEMU_UPSTREAM:=${TREE_QEMU_UPSTREAM/\/staging\//\/}} @@ -97,6 +98,10 @@ ovmf) repo_tree_rev_fetch_git ovmf \ $BASE_TREE_OVMF xen-tested-master $BASE_LOCALREV_OVMF ;; +openstack) + repo_tree_rev_fetch_git devstack \ + $TREE_DEVSTACK master $BASE_LOCALREV_DEVSTACK + ;; 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 3db2375..72a09c5 100755 --- a/ap-print-url +++ b/ap-print-url @@ -64,6 +64,9 @@ ovmf) osstest) echo none:; ;; +openstack) + echo $TREE_DEVSTACK + ;; *) echo >&2 "branch $branch ?" exit 1 diff --git a/cri-common b/cri-common index ad44546..3e817b6 100644 --- a/cri-common +++ b/cri-common @@ -73,6 +73,7 @@ select_xenbranch () { seabios) tree=seabios; xenbranch=xen-unstable ;; ovmf) tree=ovmf; xenbranch=xen-unstable ;; osstest) tree=osstest; xenbranch=xen-unstable ;; + openstack) tree=devstack; xenbranch=xen-unstable ;; esac if [ "x$tree" = xlinux ]; then linuxbranch=$branch diff --git a/make-flight b/make-flight index 3b31939..a99dfe5 100755 --- a/make-flight +++ b/make-flight @@ -97,6 +97,17 @@ job_create_test_filter_callback () { *) return 1;; esac ;; + openstack) + if [ x$toolstack != xopenstack ] ; then return 1; fi + case $xenarch in + amd64) ;; + *) return 1;; + esac + case $dom0arch in + amd64) ;; + *) return 1;; + esac + ;; *) case "$job" in *-qemuu-*) @@ -473,6 +484,12 @@ test_matrix_do_one () { fi #do_passthrough_tests + + job_create_test test-$xenarch$kern-$dom0arch-devstack \ + test-devstack openstack $xenarch $dom0arch \ + tree_devstack=$TREE_DEVSTACK \ + revision_devstack=master \ + all_hostflags=$most_hostflags } test_matrix_iterate diff --git a/mfi-common b/mfi-common index a9e966f..1438b66 100644 --- a/mfi-common +++ b/mfi-common @@ -50,6 +50,7 @@ xenbranch_xsm_variants () { xen-4.3-testing) echo "false";; xen-4.4-testing) echo "false";; xen-4.5-testing) echo "false";; + openstack) echo "false";; *) echo "false true"; esac } @@ -84,6 +85,7 @@ create_build_jobs () { rumpuserxen) continue;; seabios) continue;; ovmf) continue;; + openstack) continue;; esac case "$xenbranch" in xen-3.*-testing) continue;; @@ -109,6 +111,9 @@ create_build_jobs () { " ;; esac + if [ "$arch" = i386 ] && [ "$branch" = openstack ]; then + continue + fi case "$arch" in *) suite=$defsuite;; @@ -291,6 +296,8 @@ job_create_test () { xen-4.1-testing:*) ;; *:libvirt) tsbuildjob="libvirtbuildjob=${bfi}build-$dom0arch-libvirt" ;; + *:openstack) tsbuildjob="libvirtbuildjob=${bfi}build-$dom0arch-libvirt" + ;; xen-4.2-testing:*) ;; xen-4.3-testing:*) ;; *:xend) xenbuildjob="$xenbuildjob-xend" -- Anthony PERARD