|
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [Xen-devel] [PATCH OSSTEST v3 3/3] Create a flight to test OpenStack with xen-unstable and libvirt
Signed-off-by: Anthony PERARD <anthony.perard@xxxxxxxxxx>
---
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 | 34 ++++++++++++++++++++++++++++++++++
mfi-common | 5 +++++
10 files changed, 78 insertions(+), 1 deletion(-)
diff --git a/ap-common b/ap-common
index 91425a9..a65e2fa 100644
--- a/ap-common
+++ b/ap-common
@@ -59,6 +59,17 @@
xenbranch_forqemu=${xenbranch/xen-unstable-smoke/xen-unstable}
: ${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}
@@ -86,6 +97,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 62adf79..ebcac0e 100755
--- a/ap-fetch-version
+++ b/ap-fetch-version
@@ -91,6 +91,10 @@ ovmf)
repo_tree_rev_fetch_git ovmf \
$TREE_OVMF_UPSTREAM master $LOCALREV_OVMF
;;
+openstack)
+ 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 716fc8f..1b2ebb7 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_OPENSTACK_NOVA:=daily-cron.$branch.old}
: ${BASE_TREE_QEMU_UPSTREAM:=${TREE_QEMU_UPSTREAM/\/staging\//\/}}
@@ -99,6 +100,10 @@ ovmf)
repo_tree_rev_fetch_git ovmf \
$BASE_TREE_OVMF xen-tested-master $BASE_LOCALREV_OVMF
;;
+openstack)
+ 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 c161169..57dc9d0 100755
--- a/ap-print-url
+++ b/ap-print-url
@@ -64,6 +64,9 @@ ovmf)
osstest)
echo none:;
;;
+openstack)
+ echo $TREE_OPENSTACK_NOVA
+ ;;
*)
echo >&2 "branch $branch ?"
exit 1
diff --git a/ap-push b/ap-push
index aa0ec3d..826832c 100755
--- a/ap-push
+++ b/ap-push
@@ -37,6 +37,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
@@ -101,6 +102,10 @@ ovmf)
cd $repos/ovmf
git push $TREE_OVMF $revision:refs/heads/xen-tested-master
;;
+openstack)
+ 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 dd9c30a..ac13677 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 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)
+ realtree=openstack-nova
+ NEW_REVISION=$REVISION_OPENSTACK_NOVA
+ ;;
*)
NEW_REVISION=''
wantpush=false
diff --git a/cr-for-branches b/cr-for-branches
index 8d5748b..2726ea4 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 ${EXTRA_BRANCHES}}
export BRANCHES
fetchwlem=$wlem
diff --git a/cri-common b/cri-common
index c874ff9..66d13d1 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) tree=devstack; xenbranch=xen-unstable ;;
esac
if [ "x$tree" = xlinux ]; then
linuxbranch=$branch
diff --git a/make-flight b/make-flight
index 70c909d..e5fe0d6 100755
--- a/make-flight
+++ b/make-flight
@@ -54,6 +54,11 @@ job_create_build_filter_callback () {
*) return 1 ;;
esac
;;
+ openstack)
+ case "$job" in
+ *-xsm) return 1;;
+ esac
+ ;;
esac
return 0
}
@@ -129,6 +134,16 @@ job_create_test_filter_callback () {
*) return 1;;
esac
;;
+ openstack)
+ case "$job" in
+ *-devstack) ;;
+ *) return 1;;
+ esac
+ case $dom0arch in
+ amd64) ;;
+ *) return 1;;
+ esac
+ ;;
*)
case "$job" in
*-qemuu-*)
@@ -621,6 +636,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_OPENSTACK_DEVSTACK \
+ tree_requirements=$TREE_OPENSTACK_REQUIREMENTS \
+ tree_keystone=$TREE_OPENSTACK_KEYSTONE \
+ tree_glance=$TREE_OPENSTACK_GLANCE \
+ tree_cinder=$TREE_OPENSTACK_CINDER \
+ tree_nova=$TREE_OPENSTACK_NOVA \
+ tree_tempest=$TREE_OPENSTACK_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 01a5c9e..7e30cc7 100644
--- a/mfi-common
+++ b/mfi-common
@@ -59,6 +59,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
}
@@ -102,6 +103,7 @@ create_build_jobs () {
rumpuserxen) continue;;
seabios) continue;;
ovmf) continue;;
+ openstack) continue;;
esac
case "$xenbranch" in
xen-3.*-testing) continue;;
@@ -127,6 +129,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 |