openstack/project-config
Code Issues Proposed changes

Cleanup PROJECTS and DEVSTACK_PROJECT_FROM_GIT

Browse Source 
Change Id2caf9561b361c1d4950856423282535d067e015 for devstack adds all
repositories in DEVSTACK_PROJECT_FROM_GIT to PROJECTS, so no need to add
repos in jobs to PROJECTS if there are in DEVSTACK_PROJECT_FROM_GIT.

This change went through all of jenkins/jobs and removed PROJECTS where
there is direct 1:1 correspondence. For a few files, especially ironic
and freezer, this was not doable.

Change-Id: I4b51e33b9bc0f1cb7948b69abf104e0b57b9ff52
This commit is contained in:
Andreas Jaeger 2017-04-30 07:59:09 +02:00
parent 217a956a19
commit 43c71fa427
17 changed files with 9 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
jenkins/jobs/ceilometer.yaml
View File

@ -98,7 +98,6 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-ceilometerclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-ceilometerclient
export DEVSTACK_LOCAL_CONFIG="enable_plugin ceilometer git://git.openstack.org/openstack/ceilometer"
export PROJECTS="openstack/aodh $PROJECTS"
@ -190,7 +189,6 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"GNOCCHI_ARCHIVE_POLICY=high"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"CEILOMETER_PIPELINE_INTERVAL=15"
export PROJECTS="openstack/{name} $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT={name}
function post_test_hook {{
@ -236,7 +234,10 @@
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export PROJECTS="openstack/ceilometer openstack/aodh openstack/gnocchi openstack/oslo.messaging openstack/devstack-plugin-{plugin}"
export PROJECTS="openstack/ceilometer $PROJECTS"
export PROJECTS="openstack/aodh $PROJECTS"
export PROJECTS="openstack/gnocchi $PROJECTS"
export PROJECTS="openstack/devstack-plugin-{plugin} $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin gnocchi git://git.openstack.org/openstack/gnocchi"
case "$ZUUL_BRANCH" in

2
jenkins/jobs/cinder.yaml
View File

@ -15,7 +15,6 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-cinderclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-cinderclient
export DEVSTACK_LOCAL_CONFIG="VOLUME_BACKING_FILE_SIZE=16G"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -55,7 +54,6 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-brick-cinderclient-ext $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-brick-cinderclient-ext
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

2
jenkins/jobs/congress.yaml
View File

@ -33,7 +33,6 @@
export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_tests"
export DEVSTACK_GATE_NEUTRON=1
export PROJECTS="openstack/congress $PROJECTS"
export PROJECTS="openstack/python-congressclient $PROJECTS"
export PROJECTS="openstack/congress-dashboard $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-congressclient
export PROJECTS="openstack/murano $PROJECTS"
@ -93,7 +92,6 @@
export DEVSTACK_GATE_TEMPEST_REGEX="congress_tempest_tests"
export DEVSTACK_GATE_NEUTRON=1
export PROJECTS="openstack/congress $PROJECTS"
export PROJECTS="openstack/python-congressclient $PROJECTS"
export PROJECTS="openstack/congress-dashboard $PROJECTS"
export PROJECTS="openstack/python-aodhclient $PROJECTS"
export PROJECTS="openstack/aodh $PROJECTS"

15
jenkins/jobs/devstack-gate.yaml
View File

@ -115,11 +115,6 @@
# variable.
uc_prj=$(echo $prj | tr a-z- A-Z_ | tr -cd A-Z_)
export OVERRIDE_${{uc_prj}}_PROJECT_BRANCH=$ZUUL_BRANCH
case "$prj" in
pbr)
export PROJECTS="openstack-dev/$prj $PROJECTS" ;;
*) export PROJECTS="openstack/$prj $PROJECTS" ;;
esac
done
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
@ -157,11 +152,6 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
REPOSITORY="openstack/{name}"
if [ "{name}" = "pbr" ]; then
REPOSITORY="openstack-dev/pbr"
fi
export PROJECTS="$REPOSITORY $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
@ -202,7 +192,6 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/{name} $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
@ -1019,7 +1008,7 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack-dev/grenade openstack/{name} $PROJECTS"
export PROJECTS="openstack-dev/grenade $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup
@ -1766,7 +1755,7 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack-dev/grenade openstack/{name} $PROJECTS"
export PROJECTS="openstack-dev/grenade $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup

2
jenkins/jobs/glance.yaml
View File

@ -15,7 +15,6 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-glanceclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-glanceclient
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -60,7 +59,6 @@
export PYTHONUNBUFFERED=true
export ENABLED_SERVICES=g-api,n-api
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/glance_store $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=glance_store
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

1
jenkins/jobs/heat.yaml
View File

@ -208,7 +208,6 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-heatclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-heatclient
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"

1
jenkins/jobs/keystone.yaml
View File

@ -125,7 +125,6 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-keystoneclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-keystoneclient
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

2
jenkins/jobs/kuryr.yaml
View File

@ -112,7 +112,6 @@
export DEVSTACK_LOCAL_CONFIG="enable_plugin kuryr-libnetwork http://git.openstack.org/openstack/kuryr-libnetwork"
if [ "{kuryr_lib-src}" == "-kuryr_lib-src" ] ; then
export DEVSTACK_PROJECT_FROM_GIT="kuryr"
export PROJECTS="openstack/kuryr $PROJECTS"
fi
function gate_hook {{
@ -162,7 +161,6 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin rally git://git.openstack.org/openstack/rally"
if [ "{kuryr_lib-src}" == "-kuryr_lib-src" ] ; then
export DEVSTACK_PROJECT_FROM_GIT="kuryr"
export PROJECTS="openstack/kuryr $PROJECTS"
fi
export ENABLED_SERVICES=kuryr-libnetwork,etcd-server,docker-engine

4
jenkins/jobs/mistral.yaml
View File

@ -17,14 +17,16 @@
export DEVSTACK_GATE_NEUTRON=1
if [ "{component}" = "python-mistralclient" ] ; then
# This puts the repo in PROJECTS
export DEVSTACK_PROJECT_FROM_GIT="python-mistralclient"
else
export PROJECTS="openstack/python-mistralclient $PROJECTS"
fi
export ENABLED_SERVICES=heat,h-api,h-api-cfn,h-api-cw,h-eng,tempest
export PROJECTS="openstack/heat $PROJECTS"
export PROJECTS="openstack/mistral $PROJECTS"
export PROJECTS="openstack/mistral-dashboard $PROJECTS"
export PROJECTS="openstack/python-mistralclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin mistral https://git.openstack.org/openstack/mistral"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin heat git://git.openstack.org/openstack/heat"

1
jenkins/jobs/murano.yaml
View File

@ -84,7 +84,6 @@
export PROJECTS="openstack/python-heatclient $PROJECTS"
export PROJECTS="openstack/murano $PROJECTS"
export PROJECTS="openstack/murano-dashboard $PROJECTS"
export PROJECTS="openstack/python-muranoclient $PROJECTS"
export KEEP_LOCALRC=1
# Enable murano devstack plugin. Provided repo should be cloned by zuul before devstack run

1
jenkins/jobs/neutron.yaml
View File

@ -310,7 +310,6 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-neutronclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-neutronclient
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

2
jenkins/jobs/nova.yaml
View File

@ -15,7 +15,6 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-novaclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-novaclient
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -64,7 +63,6 @@
#!/bin/bash -xe
export PYTHONUNBUFFERED=true
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/osc-placement $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=osc-placement
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

6
jenkins/jobs/osc.yaml
View File

@ -29,7 +29,6 @@
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-openstackclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-openstackclient
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -87,10 +86,6 @@
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/osc-lib $PROJECTS"
export PROJECTS="openstack/python-openstackclient $PROJECTS"
export PROJECTS="openstack/python-openstacksdk $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT="python-openstackclient,python-openstacksdk,osc-lib,os-client-config"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -149,7 +144,6 @@
export DEVSTACK_GATE_NEUTRON=0
export DEVSTACK_GATE_CELLS=1
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-openstackclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-openstackclient
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

3
jenkins/jobs/sahara.yaml
View File

@ -26,7 +26,6 @@
fi
if [ "$ZUUL_PROJECT" = "openstack/python-saharaclient" ]; then
export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient
export PROJECTS="openstack/python-saharaclient $PROJECTS"
fi
if [ "{multinode}" -eq 1 ] ; then
export DEVSTACK_GATE_TOPOLOGY="multinode"
@ -220,7 +219,6 @@
if [ "$ZUUL_PROJECT" = "openstack/python-saharaclient" ]; then
export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient
export PROJECTS="openstack/python-saharaclient $PROJECTS"
fi
function pre_test_hook {{
@ -420,7 +418,6 @@
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/python-saharaclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh

1
jenkins/jobs/senlin.yaml
View File

@ -92,7 +92,6 @@
export BRANCH_OVERRIDE={branch-override}
export KEEP_LOCALRC=1
export PROJECTS="openstack/senlin $PROJECTS"
export PROJECTS="openstack/python-senlinclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin senlin https://git.openstack.org/openstack/senlin"
export DEVSTACK_PROJECT_FROM_GIT=python-senlinclient
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_service sl-api sl-eng"

1
jenkins/jobs/swift.yaml
View File

@ -62,7 +62,6 @@
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_INSTALL_TESTONLY=1
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-swiftclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-swiftclient
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

5
jenkins/jobs/trove.yaml
View File

@ -22,7 +22,6 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
export DEVSTACK_GATE_TROVE=1
export PROJECTS="openstack/python-troveclient $PROJECTS"
export PROJECTS="openstack/trove-dashboard $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
@ -72,7 +71,6 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
export DEVSTACK_GATE_TROVE=1
export PROJECTS="openstack/python-troveclient $PROJECTS"
export PROJECTS="openstack/trove-dashboard $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
@ -121,7 +119,6 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
export DEVSTACK_GATE_TROVE=1
export PROJECTS="openstack/python-troveclient $PROJECTS"
export PROJECTS="openstack/trove-dashboard $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
@ -172,7 +169,6 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
export DEVSTACK_GATE_TROVE=1
export PROJECTS="openstack/python-troveclient $PROJECTS"
export PROJECTS="openstack/trove-dashboard $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
export PROJECTS="openstack/tripleo-image-elements $PROJECTS"
@ -223,7 +219,6 @@
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/python-troveclient $PROJECTS"
export PROJECTS="openstack/trove-dashboard $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh