openstack
/
project-config
Code Issues Proposed changes

Use DEVSTACK_PROJECT_FROM_GIT (1/2) 

Use devstack-gate variable DEVSTACK_PROJECT_FROM_GIT instead of devstack
variable LIBS_FROM_GIT. In this case, we do not need to set PROJECTS
variable and can thus avoid some duplication.

In barbican.yaml: Rework several if conditions into elifs since only one
of these can be true - this makes it easy to see that we do not override
DEVSTACK_PROJECT_FROM_GIT wrongly.

Change-Id: Ib7b187ab9d44d76a007abc23a0feafaab1855030
This commit is contained in:
Andreas Jaeger 2017-04-30 16:48:07 +02:00
parent 43c71fa427
commit 0109c93059
5 changed files with 36 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jenkins/jobs/barbican.yaml
View File

@ -130,19 +130,11 @@
if [ "{special}" == "-postgres" ] ; then
export DEVSTACK_GATE_POSTGRES=1
fi
if [ "{special}" == "-castellan-from-git" ] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=castellan"
export PROJECTS="openstack/castellan $PROJECTS"
fi
if [ "{special}" == "-cursive" ] ; then
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=cursive"
export PROJECTS="openstack/cursive $PROJECTS"
fi
if [ "{special}" == "-py35" ] ; then
elif [ "{special}" == "-castellan-from-git" ] ; then
export DEVSTACK_PROJECT_FROM_GIT="castellan"
elif [ "{special}" == "-cursive" ] ; then
export DEVSTACK_PROJECT_FROM_GIT="cursive"
elif [ "{special}" == "-py35" ] ; then
export DEVSTACK_GATE_USE_PYTHON3=True
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-account"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"disable_service s-container"

3
jenkins/jobs/castellan.yaml
View File

@ -16,11 +16,10 @@
export PYTHONUNBUFFERED=true
export ENABLED_SERVICES=tempest,keystone
export PROJECTS="openstack/barbican $PROJECTS"
export PROJECTS="openstack/python-barbicanclient $PROJECTS"
export PROJECTS="openstack/barbican-tempest-plugin $PROJECTS"
export PROJECTS="openstack/castellan $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin barbican git://git.openstack.org/openstack/barbican"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=python-barbicanclient"
export DEVSTACK_PROJECT_FROM_GIT="python-barbicanclient"
function gate_hook {
$BASE/new/castellan/castellan/tests/contrib/gate_hook.sh

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

@ -515,8 +515,7 @@
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
# enable to use os-vif for Nova
export PROJECTS="openstack/os-vif $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=os-vif"
export DEVSTACK_PROJECT_FROM_GIT="os-vif"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -908,44 +907,24 @@
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/oslo.cache $PROJECTS"
export PROJECTS="openstack/oslo.concurrency $PROJECTS"
export PROJECTS="openstack/oslo.config $PROJECTS"
export PROJECTS="openstack/oslo.context $PROJECTS"
export PROJECTS="openstack/oslo.db $PROJECTS"
export PROJECTS="openstack/oslo.i18n $PROJECTS"
export PROJECTS="openstack/oslo.log $PROJECTS"
export PROJECTS="openstack/oslo.messaging $PROJECTS"
export PROJECTS="openstack/oslo.middleware $PROJECTS"
export PROJECTS="openstack/oslo.policy $PROJECTS"
export PROJECTS="openstack/oslo.privsep $PROJECTS"
export PROJECTS="openstack/oslo.reports $PROJECTS"
export PROJECTS="openstack/oslo.rootwrap $PROJECTS"
export PROJECTS="openstack/oslo.serialization $PROJECTS"
export PROJECTS="openstack/oslo.service $PROJECTS"
export PROJECTS="openstack/oslo.utils $PROJECTS"
export PROJECTS="openstack/oslo.versionedobjects $PROJECTS"
export PROJECTS="openstack/oslo.vmware $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=oslo.cache"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.concurrency"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.config"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.context"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.db"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.i18n"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.log"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.messaging"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.middleware"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.policy"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.privsep"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.reports"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.rootwrap"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.serialization"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.service"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.utils"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.versionedobjects"
export DEVSTACK_LOCAL_CONFIG+=$",oslo.vmware"
export DEVSTACK_LOCAL_CONFIG+=$'\n'""
export DEVSTACK_PROJECT_FROM_GIT="oslo.cache"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.concurrency"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.config"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.context"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.db"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.i18n"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.log"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.messaging"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.middleware"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.policy"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.privsep"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.reports"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.rootwrap"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.serialization"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.service"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.utils"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.versionedobjects"
export DEVSTACK_PROJECT_FROM_GIT+=",oslo.vmware"
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
@ -1125,15 +1104,14 @@
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack-dev/grenade $PROJECTS"
export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/keystoneauth $PROJECTS"
export PROJECTS="openstack/python-novaclient $PROJECTS"
export PROJECTS="openstack/python-keystoneclient $PROJECTS"
export PROJECTS="openstack/python-glanceclient $PROJECTS"
export PROJECTS="openstack/python-cinderclient $PROJECTS"
export PROJECTS="openstack/python-neutronclient $PROJECTS"
export PROJECTS="openstack/python-ironicclient $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=os-client-config,keystoneauth,python-novaclient,python-keystoneclient,python-glanceclient,python-cinderclient,python-neutronclient,python-ironicclient"
export DEVSTACK_PROJECT_FROM_GIT="os-client-config"
export DEVSTACK_PROJECT_FROM_GIT+=",keystoneauth"
export DEVSTACK_PROJECT_FROM_GIT+=",python-novaclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-keystoneclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-glanceclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-cinderclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-neutronclient"
export DEVSTACK_PROJECT_FROM_GIT+=",python-ironicclient"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_GRENADE=pullup

3
jenkins/jobs/heat.yaml
View File

@ -124,11 +124,10 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"HEAT_USE_MOD_WSGI=False"
fi
if [ "{special}" == "-amqp1" ] ; then
export PROJECTS="openstack/oslo.messaging $PROJECTS"
export PROJECTS="openstack/devstack-plugin-amqp1 $PROJECTS"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"export AMQP1_SERVICE=qpid-hybrid"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin devstack-plugin-amqp1 git://git.openstack.org/openstack/devstack-plugin-amqp1"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=oslo.messaging"
export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
fi
function pre_test_hook {{
cd /opt/stack/new/heat/heat_integrationtests

4
jenkins/jobs/oslo.yaml
View File

@ -53,9 +53,9 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TEMPEST=1
export DEVSTACK_GATE_TEMPEST_FULL=1
export PROJECTS="{plugin-repo} openstack/oslo.messaging $PROJECTS"
export PROJECTS="{plugin-repo} $PROJECTS"
export DEVSTACK_LOCAL_CONFIG="enable_plugin devstack-plugin-{plugin} git://git.openstack.org/{plugin-repo}"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"LIBS_FROM_GIT=oslo.messaging"
export DEVSTACK_PROJECT_FROM_GIT="oslo.messaging"
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh