Xenialify Sahara Grenade Job

This updates the Sahara Grenade job to run on Xenial for changes ot
branches >= master/ocata. Older branches continue to run their grenade
job on Trusty.

Change-Id: Iec171af111e8ac5bfb922cbf3b920cd448ddb2e2
This commit is contained in:
Clark Boylan 2016-12-08 11:59:27 -08:00
parent d1c06b1030
commit d2b3c0fad1
4 changed files with 10 additions and 6 deletions

View File

@ -2203,7 +2203,6 @@
- '{pipeline}-grenade-dsvm-neutron-forward-{node}{job-suffix}' - '{pipeline}-grenade-dsvm-neutron-forward-{node}{job-suffix}'
- '{pipeline}-grenade-dsvm-ironic-{node}{job-suffix}' - '{pipeline}-grenade-dsvm-ironic-{node}{job-suffix}'
- '{pipeline}-grenade-dsvm-neutron-{node}{job-suffix}' - '{pipeline}-grenade-dsvm-neutron-{node}{job-suffix}'
- '{pipeline}-grenade-dsvm-sahara{job-suffix}'
- '{pipeline}-grenade-dsvm-trove{job-suffix}' - '{pipeline}-grenade-dsvm-trove{job-suffix}'
- '{pipeline}-grenade-dsvm-{node}{job-suffix}' - '{pipeline}-grenade-dsvm-{node}{job-suffix}'
- '{pipeline}-tempest-dsvm-cells-{node}{job-suffix}' - '{pipeline}-tempest-dsvm-cells-{node}{job-suffix}'

View File

@ -13972,6 +13972,13 @@
network: nova network: nova
- api-ref-jobs: - api-ref-jobs:
service: data-processing service: data-processing
- '{pipeline}-grenade-dsvm-sahara-{node}{job-suffix}':
pipeline: gate
node:
- ubuntu-trusty
- ubuntu-xenial
job-suffix: '-nv'
branch-override: default
- project: - project:
name: sahara-ci-config name: sahara-ci-config

View File

@ -226,7 +226,7 @@
- job-template: - job-template:
name: '{pipeline}-grenade-dsvm-sahara{job-suffix}' name: '{pipeline}-grenade-dsvm-sahara-{node}{job-suffix}'
node: '{node}' node: '{node}'
wrappers: wrappers:

View File

@ -2565,9 +2565,6 @@ jobs:
- name: ^gate-sahara-buildimages.*$ - name: ^gate-sahara-buildimages.*$
voting: false voting: false
- name: gate-grenade-dsvm-sahara
voting: false
- name: ^gate-sahara-dsvm-scenario-(nova|neutron)-ubuntu-trusty$ - name: ^gate-sahara-dsvm-scenario-(nova|neutron)-ubuntu-trusty$
branch: ^stable/mitaka$ branch: ^stable/mitaka$
@ -16374,7 +16371,8 @@ projects:
- gate-tempest-dsvm-sahara-ubuntu-xenial - gate-tempest-dsvm-sahara-ubuntu-xenial
- sahara-coverage-db-ubuntu-trusty - sahara-coverage-db-ubuntu-trusty
- sahara-coverage-db-ubuntu-xenial - sahara-coverage-db-ubuntu-xenial
- gate-grenade-dsvm-sahara - gate-grenade-dsvm-sahara-ubuntu-trusty-nv
- gate-grenade-dsvm-sahara-ubuntu-xenial-nv
- gate-sahara-dsvm-scenario-neutron-ubuntu-xenial - gate-sahara-dsvm-scenario-neutron-ubuntu-xenial
- gate-sahara-dsvm-scenario-neutron-ubuntu-trusty - gate-sahara-dsvm-scenario-neutron-ubuntu-trusty
- gate-sahara-dsvm-scenario-nova-ubuntu-trusty - gate-sahara-dsvm-scenario-nova-ubuntu-trusty