openstack/project-config
Code Issues Proposed changes

Collapse shade legacy and neutron jobs

Browse Source 
legacy and legacy-libs are only different in the git repo checkout.
neutron and neutron-libs are only different in the git repo checkout.

Collapse them from 4 definitions to 2, with parameters.

Also, collapse the template expansion into single calls. This will
expand a few combos we don't use, but that's not actually important
since we're not creating jobs in jenkins.

Finally, remove "neutron" from the normal job names. Neutron is the
default, there is no need to name it.

Change-Id: Ia1c5a25c8b3d1205e34456a46b862e3ea55cda43
This commit is contained in:
Monty Taylor 2017-05-20 08:36:57 -05:00
parent 24ce8f1708
commit 69673b1e6b
No known key found for this signature in database
GPG Key ID: 7BAE94BC7141A594
3 changed files with 41 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
jenkins/jobs/projects.yaml
View File

@ -14054,41 +14054,34 @@
- pypi-jobs
- openstack-releasenotes-jobs
- openstack-client-publish-jobs
- '{pipeline}-shade-dsvm-functional-legacy{suffix}':
- '{pipeline}-shade-dsvm-functional-legacy{libs}{suffix}':
pipeline: gate
node: ubuntu-xenial
suffix: ''
suffix:
- ''
- '-nv'
libs:
- ''
- '-libs'
branch-override: stable/newton
- '{pipeline}-shade-dsvm-functional-legacy-libs{suffix}':
- '{pipeline}-shade-dsvm-functional{libs}{python}{suffix}':
pipeline: gate
node: ubuntu-xenial
suffix: '-nv'
branch-override: stable/newton
- '{pipeline}-shade-dsvm-functional-libs{python}{suffix}':
pipeline: gate
node: ubuntu-xenial
suffix: '-nv'
suffix:
- ''
- '-nv'
libs:
- ''
- '-libs'
branch-override: default
python:
- ''
- '-py35'
- ''
- '-py35'
- '{pipeline}-shade-dsvm-functional-magnum{suffix}':
pipeline: gate
node: ubuntu-xenial
suffix: '-nv'
branch-override: default
- '{pipeline}-shade-dsvm-functional-neutron{python}{suffix}':
pipeline: gate
node: ubuntu-xenial
suffix: ''
branch-override: default
python: ''
- '{pipeline}-shade-dsvm-functional-neutron{python}{suffix}':
pipeline: gate
node: ubuntu-xenial
suffix: '-nv'
branch-override: default
python: '-py35'
- '{pipeline}-shade-dsvm-ansible{release}{suffix}':
pipeline: gate
node: ubuntu-xenial

142
jenkins/jobs/shade.yaml
View File

@ -15,7 +15,7 @@
disable_service horizon
- job-template:
name: '{pipeline}-shade-dsvm-functional-legacy{suffix}'
name: '{pipeline}-shade-dsvm-functional-legacy{libs}{suffix}'
node: '{node}'
wrappers:
@ -54,75 +54,22 @@
export PROJECTS="openstack-infra/shade $PROJECTS"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
if [ "{libs}" == "-libs" ]; then
export PROJECTS="openstack/keystoneauth $PROJECTS"
export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/python-keystoneclient $PROJECTS"
export PROJECTS="openstack/python-novaclient $PROJECTS"
# The purpose of the -libs job is to test that latest libs work
# with old devstack. We don't want to install devstack from
# libs tips. We want to install tip of master into our
# functional venv.
export OVERRIDE_OS_CLIENT_CONFIG_PROJECT_BRANCH="master"
export OVERRIDE_KEYSTONEAUTH_PROJECT_BRANCH="master"
export OVERRIDE_PYTHON_NOVACLIENT_PROJECT_BRANCH="master"
export OVERRIDE_PYTHON_KEYSTONECLIENT_PROJECT_BRANCH="master"
fi
function post_test_hook {{
$BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh
}}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-shade-dsvm-functional-legacy-libs{suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 70
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- local_conf:
conf: |
[[local|localrc]]
ENABLE_IDENTITY_V2=True
enable_plugin heat https://git.openstack.org/openstack/heat
disable_service ceilometer-acentral
disable_service ceilometer-acompute
disable_service ceilometer-alarm-evaluator
disable_service ceilometer-alarm-notifier
disable_service ceilometer-anotification
disable_service ceilometer-api
disable_service ceilometer-collector
disable_service horizon
- shell: |
#!/bin/bash -xe
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=0
export PYTHONUNBUFFERED=true
export SHADE_HAS_DESIGNATE=0
export SHADE_HAS_HEAT=1
export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=0
export SHADE_HAS_SWIFT=1
export SHADE_USE_KEYSTONE_V2=1
export PROJECTS="openstack-infra/shade $PROJECTS"
export PROJECTS="openstack/keystoneauth $PROJECTS"
export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/python-keystoneclient $PROJECTS"
export PROJECTS="openstack/python-novaclient $PROJECTS"
# The purpose of this job is to test that latest libs work with
# newton devstack. We don't want to install devstack from branch
# tips. We want to install branch tips (of master) into our
# functional venv.
export OVERRIDE_OS_CLIENT_CONFIG_PROJECT_BRANCH="master"
export OVERRIDE_KEYSTONEAUTH_PROJECT_BRANCH="master"
export OVERRIDE_PYTHON_NOVACLIENT_PROJECT_BRANCH="master"
export OVERRIDE_PYTHON_KEYSTONECLIENT_PROJECT_BRANCH="master"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@ -141,7 +88,7 @@
- console-log
- job-template:
name: '{pipeline}-shade-dsvm-functional-neutron{python}{suffix}'
name: '{pipeline}-shade-dsvm-functional{libs}{python}{suffix}'
node: '{node}'
wrappers:
@ -169,6 +116,12 @@
fi
export PROJECTS="openstack-infra/shade $PROJECTS"
if [ "{libs}" == "-libs" ]; then
export PROJECTS="openstack/keystoneauth $PROJECTS"
export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/python-keystoneclient $PROJECTS"
export PROJECTS="openstack/python-novaclient $PROJECTS"
fi
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@ -250,57 +203,6 @@
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-shade-dsvm-functional-libs{python}{suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 70
- timestamps
builders:
- link-logs
- net-info
- devstack-checkout
- shade-local-conf
- shell: |
#!/bin/bash -xe
export DEVSTACK_GATE_HEAT=1
export DEVSTACK_GATE_NEUTRON=1
export PYTHONUNBUFFERED=true
export SHADE_HAS_DESIGNATE=0
export SHADE_HAS_HEAT=1
export SHADE_HAS_MAGNUM=0
export SHADE_HAS_NEUTRON=1
export SHADE_HAS_SWIFT=1
if [ "{python}" == "-py35" ]; then
export SHADE_TOX_PYTHON=python3
fi
export PROJECTS="openstack-infra/shade $PROJECTS"
export PROJECTS="openstack/keystoneauth $PROJECTS"
export PROJECTS="openstack/os-client-config $PROJECTS"
export PROJECTS="openstack/python-keystoneclient $PROJECTS"
export PROJECTS="openstack/python-novaclient $PROJECTS"
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
function post_test_hook {{
$BASE/new/shade/shade/tests/functional/hooks/post_test_hook.sh tips
}}
export -f post_test_hook
cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
./safe-devstack-vm-gate-wrap.sh
publishers:
- devstack-logs
- console-log
- job-template:
name: '{pipeline}-shade-dsvm-ansible{release}{suffix}'
node: '{node}'

6
zuul/layout.yaml
View File

@ -5272,14 +5272,14 @@ projects:
- gate-shade-dsvm-functional-legacy-libs-nv
- gate-shade-dsvm-functional-libs-nv
- gate-shade-dsvm-functional-libs-py35-nv
- gate-shade-dsvm-functional-neutron
- gate-shade-dsvm-functional-neutron-py35-nv
- gate-shade-dsvm-functional
- gate-shade-dsvm-functional-py35-nv
- gate-shade-dsvm-ansible
- gate-shade-dsvm-ansible-dev-nv
- gate-dsvm-nodepool-src
gate:
- gate-shade-dsvm-functional-legacy
- gate-shade-dsvm-functional-neutron
- gate-shade-dsvm-functional
- gate-shade-dsvm-ansible
- gate-dsvm-nodepool-src
post: