|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v2 6/6] Create a flight to test OpenStack with xen-unstable and libvirt
Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
ap-common | 9 +++++++++
ap-fetch-version | 4 ++++
ap-fetch-version-old | 5 +++++
ap-print-url | 3 +++
cri-common | 1 +
make-flight | 42 +++++++++++++++++++++++++++++++++++++++++-
mfi-common | 5 +++++
7 files changed, 68 insertions(+), 1 deletion(-)
diff --git a/ap-common b/ap-common
index dfeab9e..40eda02 100644
--- a/ap-common
+++ b/ap-common
@@ -57,6 +57,14 @@
: ${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}
+:
${TREE_OPENSTACK_REQUIREMENTS:=git://git.openstack.org/openstack/requirements.git}
+: ${TREE_KEYSTONE:=git://git.openstack.org/openstack/keystone.git}
+: ${TREE_GLANCE:=git://git.openstack.org/openstack/glance.git}
+: ${TREE_CINDER:=git://git.openstack.org/openstack/cinder.git}
+: ${TREE_NOVA:=git://git.openstack.org/openstack/nova.git}
+: ${TREE_TEMPEST:=git://git.openstack.org/openstack/tempest.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 +92,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 c161169..58ac761 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 5c58482..18f5d60 100644
--- a/cri-common
+++ b/cri-common
@@ -74,6 +74,7 @@ select_xenbranch () {
ovmf) tree=ovmf; xenbranch=xen-unstable ;;
distros-*) tree=none; 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 cfb6540..ebf7258 100755
--- a/make-flight
+++ b/make-flight
@@ -35,7 +35,14 @@ defsuite=`getconfig DebianSuite`
defguestsuite=`getconfig GuestDebianSuite`
job_create_build_filter_callback () {
- :
+ local job=$1; shift
+
+ case "$branch" in
+ openstack)
+ case "$job" in
+ *-xsm) return 1;;
+ esac
+ esac
}
if [ x$buildflight = x ]; then
@@ -101,6 +108,20 @@ job_create_test_filter_callback () {
*) return 1;;
esac
;;
+ openstack)
+ if [ x$toolstack != xlibvirt ] ; then return 1; fi
+ case "$job" in
+ test-*-libvirt*) return 1;;
+ esac
+ case $xenarch in
+ amd64) ;;
+ *) return 1;;
+ esac
+ case $dom0arch in
+ amd64) ;;
+ *) return 1;;
+ esac
+ ;;
*)
case "$job" in
*-qemuu-*)
@@ -557,6 +578,25 @@ test_matrix_do_one () {
do_pygrub_tests
do_pvgrub_tests
+
+ job_create_test test-$xenarch$kern-$dom0arch-devstack \
+ test-devstack libvirt $xenarch $dom0arch \
+ tree_devstack=$TREE_DEVSTACK \
+ tree_requirements=$TREE_OPENSTACK_REQUIREMENTS \
+ tree_keystone=$TREE_KEYSTONE \
+ tree_glance=$TREE_GLANCE \
+ tree_cinder=$TREE_CINDER \
+ tree_nova=$TREE_NOVA \
+ tree_tempest=$TREE_TEMPEST \
+ revision_devstack=master \
+ revision_requirements=master \
+ revision_keystone=master \
+ revision_glance=master \
+ revision_cinder=master \
+ revision_nova=master \
+ revision_tempest=master \
+ dom0_mem=4000 \
+ all_hostflags=$most_hostflags
}
test_matrix_iterate
diff --git a/mfi-common b/mfi-common
index c79dd11..c6a1eb7 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
}
@@ -93,6 +94,7 @@ create_build_jobs () {
rumpuserxen) continue;;
seabios) continue;;
ovmf) continue;;
+ openstack) continue;;
esac
case "$xenbranch" in
xen-3.*-testing) continue;;
@@ -118,6 +120,9 @@ create_build_jobs () {
"
;;
esac
+ if [ "$arch" = i386 ] && [ "$branch" = openstack ]; then
+ continue
+ fi
case "$arch" in
*) suite=$defsuite;;
--
Anthony PERARD
_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel
|
 |
Lists.xenproject.org is hosted with RackSpace, monitoring our |