Re: [Xen-devel] [PATCH OSSTEST v2 6/6] Create a flight to test OpenStack with xen-unstable and libvirt

[Anthony PERARD <anthony.perard@xxxxxxxxxx>]

On Tue, Sep 08, 2015 at 02:14:27PM +0100, Ian Campbell wrote:
> On Thu, 2015-08-06 at 18:03 +0100, Anthony PERARD wrote:
> > 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/requirem
> > ents.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}
> 
> Maybe these should all be TREE_OPENSTACK_FOO? And perhaps put git
> ://git.openstack.org/openstack/ into a variable (like $XENBITS or
> $GIT_KERNEL_ORG)

I'll do that.

> > +
> >  : ${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/f
> > irmware/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
> 
> This one should be pulling from the gate output on xenbits not from
> upstream. See e.g. BASE_TREE_OVMF.

OK.

> Actually, I think you've missed the ap-push changes needed to populate that
> tree, you need this in order to have a baseline.

I'll try to change ap-push.

> >  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
> > +      ;;
> 
> 
> Do you not want to only accept *-devstack here and reject everything else?

Yes, that's probably going to be more simple. I'll see if I can change
that.

> Otherwise don't you end up with various xl and HVM tests?

No, I managed to only have the few jobs needed. I've check by running
./standalone make-flight openstack, and checking the content of the
database.

-- 
Anthony PERARD

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel