Switch to xenial: lib-forward-testing/tempest-dsvm-neutron-src

Switch master and newton jobs to run on xenial, older branches test on
trusty.

Note that we have
{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{job-suffix}' as a
clone of {pipeline}-tempest-dsvm-neutron-src-{name}-{job-suffix}', we
can merge these now.

This changes also the python-troveclient specific job since it uses
lib-forward-testing in zuul.

Use lib-forward-testing template in zuul when possible.

Change-Id: Icd4454d02c89c9912a0952b073b62d515300165a
This commit is contained in:
Andreas Jaeger 2016-12-05 20:50:32 +01:00
parent f82fa729d2
commit 83b994fc71
5 changed files with 24 additions and 76 deletions

View File

@ -126,8 +126,8 @@
- devstack-logs
- console-log
# tempest-dsvm-neutron-src-{name} - run a devstack tempest job, but
# use the zuul git ref for name instead of the released library
# tempest-dsvm-neutron-src-{name}-{node} - run a devstack tempest job,
# but use the zuul git ref for name instead of the released library
# version. This uses neutron instead of nova-network.
#
# Purpose: this allows libraries to test their proposed commits to
@ -138,55 +138,6 @@
#
# Expiration: once neutron replaces nova-network as the default, this
# can be removed.
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}'
node: '{node}'
wrappers:
- build-timeout:
timeout: 180
- timestamps
builders:
- print-template-name:
template-name: "{template-name}"
- link-logs
- net-info
- 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
export DEVSTACK_GATE_NEUTRON=1
export BRANCH_OVERRIDE={branch-override}
if [ "$BRANCH_OVERRIDE" != "default" ] ; then
export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
fi
export DEVSTACK_PROJECT_FROM_GIT={name}
# Even if the branch is overridden, make sure we use
# the correct branch using the OVERRIDE_*_PROJECT_BRANCH
# variable.
uc_project=`echo $DEVSTACK_PROJECT_FROM_GIT | tr [:lower:] [:upper:] | tr '-' '_' | sed 's/[^A-Z_]//'`
export "OVERRIDE_"$uc_project"_PROJECT_BRANCH"=$ZUUL_BRANCH
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
# This job is used in testing neutron-lib master changes with
# neutron tip of master, and it provides an early feedback that
# lib development does not break neutron. This is a clone of
# the previous job, that is meant to go away at some point.
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{job-suffix}'
node: '{node}'

View File

@ -8407,13 +8407,9 @@
- '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{job-suffix}':
name: neutron-lib
pipeline: gate
node: ubuntu-xenial
job-suffix: ''
branch-override: default
- '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{job-suffix}':
name: neutron-lib
pipeline: gate
node: ubuntu-trusty
node:
- ubuntu-trusty
- ubuntu-xenial
job-suffix: ''
branch-override: default
# networking api-ref is maintained in neutron-lib repo.
@ -13411,9 +13407,11 @@
- openstack-client-publish-jobs
- pypi-jobs
- openstack-releasenotes-jobs
- '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{job-suffix}':
- '{pipeline}-tempest-dsvm-neutron-src-python-troveclient-{node}{job-suffix}':
pipeline: gate
node: ubuntu-trusty
node:
- ubuntu-trusty
- ubuntu-xenial
job-suffix: ''
branch-override: default

View File

@ -1,16 +1,18 @@
- job-group:
name: 'lib-forward-testing-{name}'
jobs:
- '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}':
- '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{job-suffix}':
pipeline: gate
node: ubuntu-trusty
node:
- ubuntu-trusty
- ubuntu-xenial
job-suffix: ''
branch-override: default
- job-group:
name: 'stable-compat-jobs-{name}'
jobs:
- '{pipeline}-tempest-dsvm-neutron-src-{name}{job-suffix}':
- '{pipeline}-tempest-dsvm-neutron-src-{name}-{node}{job-suffix}':
pipeline: gate
node: ubuntu-xenial
job-suffix: '-newton'

View File

@ -195,7 +195,7 @@
- console-log
- job-template:
name: '{pipeline}-tempest-dsvm-neutron-src-python-troveclient{job-suffix}'
name: '{pipeline}-tempest-dsvm-neutron-src-python-troveclient-{node}{job-suffix}'
node: '{node}'
wrappers:

View File

@ -491,13 +491,15 @@ project-templates:
- name: lib-forward-testing
check:
- 'gate-tempest-dsvm-neutron-src-{name}'
- 'gate-tempest-dsvm-neutron-src-{name}-ubuntu-trusty'
- 'gate-tempest-dsvm-neutron-src-{name}-ubuntu-xenial'
gate:
- 'gate-tempest-dsvm-neutron-src-{name}'
- 'gate-tempest-dsvm-neutron-src-{name}-ubuntu-trusty'
- 'gate-tempest-dsvm-neutron-src-{name}-ubuntu-xenial'
- name: stable-compat-jobs
check:
- 'gate-tempest-dsvm-neutron-src-{name}-newton'
- 'gate-tempest-dsvm-neutron-src-{name}-ubuntu-xenial-newton'
- name: lib-forward-testing-plugin
check:
@ -1419,7 +1421,7 @@ jobs:
- ^doc/.*$
- ^releasenotes/.*$
# Skip non docs jobs for doc-only neutronclient changes
- name: ^gate-(python-neutronclient-(python27|python3[45](-nv)?|pypy)|neutronclient-test-dsvm-functional(-ubuntu-.*)?|neutronclient-test-dsvm-functional-adv-svcs(-ubuntu-.*)?|tempest-dsvm-neutron-src-python-neutronclient)$
- name: ^gate-(python-neutronclient-(python27|python3[45](-nv)?|pypy)|neutronclient-test-dsvm-functional(-ubuntu-.*)?|neutronclient-test-dsvm-functional-adv-svcs(-ubuntu-.*)?|tempest-dsvm-neutron-src-python-neutronclient(-ubuntu-.*)?)$
skip-if:
- project: ^openstack/python-neutronclient$
all-files-match-any:
@ -6338,11 +6340,9 @@ projects:
check:
- gate-cliff-tox-neutronclient-tip-ubuntu-xenial
- gate-cliff-tox-openstackclient-tip-ubuntu-xenial
- gate-tempest-dsvm-neutron-src-cliff
gate:
- gate-cliff-tox-neutronclient-tip-ubuntu-xenial
- gate-cliff-tox-openstackclient-tip-ubuntu-xenial
- gate-tempest-dsvm-neutron-src-cliff
- name: openstack/cloud-init
template:
@ -12383,17 +12383,13 @@ projects:
- name: python-jobs
- name: python34-jobs
- name: python35-jobs
- name: lib-forward-testing
- name: translation-jobs
- name: api-ref-jobs
- name: release-notes-jobs
check:
- gate-tempest-dsvm-neutron-src-neutron-lib-ubuntu-trusty
- gate-tempest-dsvm-neutron-src-neutron-lib-ubuntu-xenial
- neutron-lib-coverage-ubuntu-trusty
- neutron-lib-coverage-ubuntu-xenial
gate:
- gate-tempest-dsvm-neutron-src-neutron-lib-ubuntu-trusty
- gate-tempest-dsvm-neutron-src-neutron-lib-ubuntu-xenial
- name: openstack/neutron-specs
template:
@ -12530,7 +12526,8 @@ projects:
- gate-tempest-dsvm-ironic-pxe_ipa-full-nv
- gate-tempest-dsvm-lxc-ubuntu-trusty
- gate-tempest-dsvm-lvm
- gate-tempest-dsvm-neutron-src-oslo.versionedobjects
- gate-tempest-dsvm-neutron-src-oslo.versionedobjects-ubuntu-trusty
- gate-tempest-dsvm-neutron-src-oslo.versionedobjects-ubuntu-xenial
- gate-tempest-dsvm-nova-os-vif-nv
- gate-tempest-dsvm-nova-libvirt-kvm-apr
- gate-tempest-dsvm-ironic-multitenant-network-ubuntu-xenial