From 451eb94987d4fab83046f7ee7e4092dcce6a066d Mon Sep 17 00:00:00 2001 From: Colleen Murphy Date: Thu, 22 Jun 2017 11:32:51 +0200 Subject: [PATCH] Group all horizon-related projects together If django_openstack_auth or manila-ui are the projects being tested, DEVSTACK_GATE_HORIZON may not be explicitly set for some gate jobs. For instance, the tempest-dsvm-neutron-src job is run for django_openstack_auth. Special case horizon-related projects to make sure horizon is set up for them. Also further condense these projects in the PROJECTS list to reduce the number of git repos we need to configure in the default case Co-Authored-By: Clark Boylan Change-Id: I384e4c376076051e7a4a8b2d704107cbe3ac08ad Depends-On: Iafebfc92017d859cd3062fc4b6fab2986dfc5c98 --- devstack-vm-gate-wrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/devstack-vm-gate-wrap.sh b/devstack-vm-gate-wrap.sh index 1555bbc7..7ac08986 100755 --- a/devstack-vm-gate-wrap.sh +++ b/devstack-vm-gate-wrap.sh @@ -72,8 +72,10 @@ PROJECTS="openstack/glance $PROJECTS" PROJECTS="openstack/heat $PROJECTS" PROJECTS="openstack/heat-cfntools $PROJECTS" PROJECTS="openstack/heat-templates $PROJECTS" -if [[ "$DEVSTACK_GATE_HORIZON" -eq "1" ]] ; then +if [[ "$DEVSTACK_GATE_HORIZON" -eq "1" || "$DEVSTACK_PROJECT_FROM_GIT" -eq "django_openstack_auth" || "$DEVSTACK_PROJECT_FROM_GIT" -eq "manila-ui" ]] ; then PROJECTS="openstack/horizon $PROJECTS" + PROJECTS="openstack/django_openstack_auth $PROJECTS" + PROJECTS="openstack/manila-ui $PROJECTS" fi PROJECTS="openstack/keystone $PROJECTS" PROJECTS="openstack/neutron $PROJECTS" @@ -94,12 +96,10 @@ if [[ "$DEVSTACK_GATE_HEAT" -eq "1" ]] ; then PROJECTS="openstack/dib-utils $PROJECTS" PROJECTS="openstack/diskimage-builder $PROJECTS" fi -PROJECTS="openstack/django_openstack_auth $PROJECTS" PROJECTS="openstack/glance_store $PROJECTS" PROJECTS="openstack/keystoneauth $PROJECTS" PROJECTS="openstack/keystonemiddleware $PROJECTS" PROJECTS="openstack/manila $PROJECTS" -PROJECTS="openstack/manila-ui $PROJECTS" PROJECTS="openstack/zaqar $PROJECTS" PROJECTS="openstack/neutron-fwaas $PROJECTS" PROJECTS="openstack/neutron-lbaas $PROJECTS"