Change node to xenial.

The following aodh commit requires mysql>=5.6.4, causing
vitrage jenkins job failures when trusty node is used.
So we specify xenial node.

f8d3068bd2 (diff-6f7ec000163298dd067c3235a378b765)

Change-Id: Ia74a1eb55f97b13c300cc20c458632c9f9536ecd
This commit is contained in:
Alexey Weyl 2016-11-21 14:59:43 +02:00
parent 0bad72bb2e
commit 502908c7ac
3 changed files with 19 additions and 11 deletions

View File

@ -15355,15 +15355,19 @@
- 'gate-{name}-python35{suffix}':
suffix: ''
- pypi-jobs
- '{pipeline}-vitrage-dsvm-{suite}{job-suffix}':
- '{pipeline}-vitrage-dsvm-{suite}-{node}{job-suffix}':
pipeline: gate
node: ubuntu-trusty
node:
- ubuntu-trusty
- ubuntu-xenial
suite: 'api'
job-suffix: ''
branch-override: default
- '{pipeline}-vitrage-dsvm-{suite}{job-suffix}':
- '{pipeline}-vitrage-dsvm-{suite}-{node}{job-suffix}':
pipeline: gate
node: ubuntu-trusty
node:
- ubuntu-trusty
- ubuntu-xenial
suite: 'datasources'
job-suffix: ''
branch-override: default

View File

@ -1,5 +1,5 @@
- job-template:
name: '{pipeline}-vitrage-dsvm-{suite}{job-suffix}'
name: '{pipeline}-vitrage-dsvm-{suite}-{node}{job-suffix}'
node: '{node}'
wrappers:

View File

@ -1884,8 +1884,8 @@ jobs:
# NOTE(aweyl) tempest test for vitrage was introduced in the mitaka cycle,
# so testing the earlier branches doesn't make sense.
- name: ^gate-vitrage-dsvm-datasources$
branch: ^(?!stable/liberty).*$
- name: ^gate-vitrage-dsvm-datasources-ubuntu-trusty$
branch: ^stable/mitaka$
# NOTE(markvan) (heat) functional lbaas v2 testing was introduced in the mitaka
# cycle as experimental, so testing it there and earlier branches doesn't make sense.
@ -17817,11 +17817,15 @@ projects:
- name: publish-to-pypi
- name: openstack-server-publish-jobs
check:
- gate-vitrage-dsvm-api
- gate-vitrage-dsvm-datasources
- gate-vitrage-dsvm-api-ubuntu-trusty
- gate-vitrage-dsvm-api-ubuntu-xenial
- gate-vitrage-dsvm-datasources-ubuntu-trusty
- gate-vitrage-dsvm-datasources-ubuntu-xenial
gate:
- gate-vitrage-dsvm-api
- gate-vitrage-dsvm-datasources
- gate-vitrage-dsvm-api-ubuntu-trusty
- gate-vitrage-dsvm-api-ubuntu-xenial
- gate-vitrage-dsvm-datasources-ubuntu-trusty
- gate-vitrage-dsvm-datasources-ubuntu-xenial
- name: openstack/vitrage-dashboard
template: