openstack/project-config
Code Issues Proposed changes

Transition gce-api jobs to xenial

Browse Source 
More of the Trusty to Xenial transition. Changes to branches >= newton
will have their jobs run on Xenial. Older branches will run jobs on
Trusty.

Change-Id: Ibf56a10d15ccb3e9f58daff9ae9fea08951c9a8e
This commit is contained in:
Clark Boylan 2016-12-06 11:24:02 -08:00
parent cee23e3950
commit c109841f1a
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
jenkins/jobs/gce-api.yaml
View File

@ -1,5 +1,5 @@
- job-template: - job-template:
name: '{pipeline}-functional-neutron-dsvm-gceapi{job-suffix}' name: '{pipeline}-functional-neutron-dsvm-gceapi-{node}{job-suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:
@ -39,7 +39,7 @@
- console-log - console-log
- job-template: - job-template:
name: '{pipeline}-functional-nova-network-dsvm-gceapi{job-suffix}' name: '{pipeline}-functional-nova-network-dsvm-gceapi-{node}{job-suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:

16
jenkins/jobs/projects.yaml
View File

@ -4871,15 +4871,19 @@
jobs: jobs:
- python-jobs - python-jobs
- pypi-jobs - pypi-jobs
- '{pipeline}-functional-neutron-dsvm-gceapi{job-suffix}': - '{pipeline}-functional-neutron-dsvm-gceapi-{node}{job-suffix}':
pipeline: gate pipeline: gate
node: ubuntu-trusty node:
job-suffix: '' - ubuntu-trusty
- ubuntu-xenial
job-suffix: '-nv'
branch-override: default branch-override: default
- '{pipeline}-functional-nova-network-dsvm-gceapi{job-suffix}': - '{pipeline}-functional-nova-network-dsvm-gceapi-{node}{job-suffix}':
pipeline: gate pipeline: gate
node: ubuntu-trusty node:
job-suffix: '' - ubuntu-trusty
- ubuntu-xenial
job-suffix: '-nv'
branch-override: default branch-override: default
- project: - project:

12
zuul/layout.yaml
View File

@ -2017,12 +2017,6 @@ jobs:
- name: gate-neutron-dsvm-tempest-vpnaas - name: gate-neutron-dsvm-tempest-vpnaas
branch: ^(?!stable/liberty).*$ branch: ^(?!stable/liberty).*$
- name: gate-functional-neutron-dsvm-gceapi
voting: false
- name: gate-functional-nova-network-dsvm-gceapi
voting: false
- name: gate-python-magnumclient-python34 - name: gate-python-magnumclient-python34
branch: ^(?!stable/liberty).*$ branch: ^(?!stable/liberty).*$
@ -9894,8 +9888,10 @@ projects:
- name: check-requirements - name: check-requirements
- name: publish-to-pypi - name: publish-to-pypi
check: check:
- gate-functional-neutron-dsvm-gceapi - gate-functional-neutron-dsvm-gceapi-ubuntu-trusty-nv
- gate-functional-nova-network-dsvm-gceapi - gate-functional-neutron-dsvm-gceapi-ubuntu-xenial-nv
- gate-functional-nova-network-dsvm-gceapi-ubuntu-trusty-nv
- gate-functional-nova-network-dsvm-gceapi-ubuntu-xenial-nv
- name: openstack/gerrit-dash-creator - name: openstack/gerrit-dash-creator
template: template: