Be explicit when installing clients from src

Most jobs installing client libs from pypi now, this means that we don't
need set up the client lib git repos by default in devstack-gate. But
before we can clean up devstack-gate the jobs that do need the clients
need to explicitly state that.

Note that this also setups up ironic and related things because of how
the ironic jobs work they all share a common macro.

Change-Id: I97cc3758d5c97494704406d779a7326420940427
This commit is contained in:
Clark Boylan 2015-10-13 18:27:23 -07:00
parent 7c43303e6a
commit 515d2adaf9
14 changed files with 43 additions and 0 deletions

@ -161,6 +161,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
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"
if [ "$BRANCH_OVERRIDE" != "default" ] ; then

@ -16,6 +16,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-cinderclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-cinderclient
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE

@ -92,6 +92,7 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/{name} $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
@ -135,6 +136,7 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/{name} $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
@ -167,6 +169,7 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/{name} $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
@ -216,6 +219,7 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/{name} $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_GATE_TEMPEST=1
@ -729,6 +733,10 @@
builders:
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/ironic $PROJECTS"
export PROJECTS="openstack/ironic-lib $PROJECTS"
export PROJECTS="openstack/ironic-python-agent $PROJECTS"
export PROJECTS="openstack/python-ironicclient $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT={devstack-timeout}
export DEVSTACK_GATE_TEMPEST=1
@ -901,6 +909,10 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/ironic $PROJECTS"
export PROJECTS="openstack/ironic-lib $PROJECTS"
export PROJECTS="openstack/ironic-python-agent $PROJECTS"
export PROJECTS="openstack/python-ironicclient $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
@ -1633,6 +1645,10 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/ironic $PROJECTS"
export PROJECTS="openstack/ironic-lib $PROJECTS"
export PROJECTS="openstack/ironic-python-agent $PROJECTS"
export PROJECTS="openstack/python-ironicclient $PROJECTS"
export PROJECTS="openstack-dev/grenade $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
@ -1670,6 +1686,10 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/ironic $PROJECTS"
export PROJECTS="openstack/ironic-lib $PROJECTS"
export PROJECTS="openstack/ironic-python-agent $PROJECTS"
export PROJECTS="openstack/python-ironicclient $PROJECTS"
export PROJECTS="openstack-dev/grenade $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
@ -1705,6 +1725,10 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/ironic $PROJECTS"
export PROJECTS="openstack/ironic-lib $PROJECTS"
export PROJECTS="openstack/ironic-python-agent $PROJECTS"
export PROJECTS="openstack/python-ironicclient $PROJECTS"
export PROJECTS="openstack-dev/grenade $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
@ -2171,6 +2195,7 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/{name} $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1
@ -2243,6 +2268,7 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/{name} $PROJECTS"
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=120
export DEVSTACK_GATE_TEMPEST=1

@ -16,6 +16,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
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

@ -161,6 +161,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-heatclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-heatclient
export OVERRIDE_ENABLED_SERVICES=key,mysql,rabbit,h-api,h-api-cfn,h-api-cw,h-eng,heat
if [ "$BRANCH_OVERRIDE" != "default" ] ; then

@ -16,6 +16,8 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
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
fi

@ -226,6 +226,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=70
export DEVSTACK_GATE_NEUTRON=1
export PROJECTS="openstack/python-manilaclient $PROJECTS"
if [[ $ZUUL_BRANCH = "stable/juno" ]]; then
# Juno version uses 'hooks' approach that requires explicit

@ -205,6 +205,7 @@
export DEVSTACK_GATE_TIMEOUT=60
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

@ -16,6 +16,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=60
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

@ -20,6 +20,8 @@
export DEVSTACK_GATE_EXERCISES=0
export DEVSTACK_GATE_INSTALL_TESTONLY=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
fi

@ -101,6 +101,7 @@
export DEVSTACK_GATE_TIMEOUT=60
export DEVSTACK_LOCAL_CONFIG="enable_plugin sahara git://git.openstack.org/openstack/sahara"
export BRANCH_OVERRIDE={branch-override}
export PROJECTS="openstack/python-saharaclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-saharaclient
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -264,6 +265,7 @@
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

@ -61,6 +61,7 @@
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

@ -45,6 +45,7 @@
export PYTHONUNBUFFERED=true
export DEVSTACK_GATE_TIMEOUT=140
export DEVSTACK_LOCAL_CONFIG="enable_plugin trove git://git.openstack.org/openstack/trove"
export PROJECTS="openstack/python-troveclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
export ENABLED_SERVICES=tempest,s-proxy,s-object,s-container,s-account,trove,tr-api,tr-tmgr,tr-cond
export PROJECTS="openstack/trove-integration openstack/diskimage-builder openstack/tripleo-image-elements $PROJECTS"
@ -94,6 +95,7 @@
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export PROJECTS="openstack/python-troveclient $PROJECTS"
export DEVSTACK_PROJECT_FROM_GIT=python-troveclient
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh

@ -13,6 +13,7 @@
- devstack-checkout
- shell: |
#!/bin/bash -xe
export PROJECTS="openstack/python-zaqarclient $PROJECTS"
export PYTHONUNBUFFERED=true
export FUNCTEST_TIMEOUT=30
export DEVSTACK_GATE_ZAQAR=1