Promote Monasca tempest tests on ubuntu-xenial
Tests on mitaka branch are executed with ubuntu-trusty. Newer branches are tested with ubuntu-xenial. Change-Id: I5daa4d4acf31e5f119dec5bbf23dec5c053fa9ad
This commit is contained in:
Witold Bedyk
parent
d6e02126f8
commit
521410f916
|
|
@ -100,24 +100,20 @@
|
|||
- job-group:
|
||||
name: 'tempest-monasca-full-jobs'
|
||||
jobs:
|
||||
- 'gate-tempest-dsvm-monasca-python-full-{node}{job-suffix}':
|
||||
node:
|
||||
- 'ubuntu-trusty'
|
||||
job-suffix: ''
|
||||
- 'gate-tempest-dsvm-monasca-python-full-{node}{job-suffix}':
|
||||
node:
|
||||
- 'ubuntu-trusty'
|
||||
- 'ubuntu-xenial'
|
||||
job-suffix: '-nv'
|
||||
- 'gate-tempest-dsvm-monasca-java-full-{node}{job-suffix}':
|
||||
node:
|
||||
- 'ubuntu-trusty'
|
||||
job-suffix: ''
|
||||
job-suffix:
|
||||
- ''
|
||||
- '-nv'
|
||||
- 'gate-tempest-dsvm-monasca-java-full-{node}{job-suffix}':
|
||||
node:
|
||||
- 'ubuntu-trusty'
|
||||
- 'ubuntu-xenial'
|
||||
job-suffix: '-nv'
|
||||
job-suffix:
|
||||
- ''
|
||||
- '-nv'
|
||||
|
||||
- job-template:
|
||||
name: 'gate-tempest-dsvm-monasca-log-api-{node}{suffix}'
|
||||
|
|
|
|||
|
|
@ -3452,14 +3452,6 @@ jobs:
|
|||
branch: master
|
||||
voting: false
|
||||
|
||||
# Run Monasca tempest tests for trusty on all branches. New tests for xenial
|
||||
# only on master.
|
||||
- name: ^gate-tempest-dsvm-monasca-(python|java)-full-ubuntu-trusty.*$
|
||||
branch: ^(stable/(mitaka|newton)|master)$
|
||||
|
||||
- name: ^gate-tempest-dsvm-monasca-(python|java)-full-ubuntu-xenial.*$
|
||||
branch: master
|
||||
|
||||
# Make sure we do not match openstack-ansible jobs, as they have their own
|
||||
# rules.
|
||||
- name: ^gate-(?!openstack-ansible).*(-dsvm)?-ansible-func-ubuntu-trusty(-nv)?$
|
||||
|
|
@ -11239,6 +11231,8 @@ projects:
|
|||
- gate-monasca-agent-python27-ubuntu-xenial
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
|
||||
gate:
|
||||
- gate-monasca-agent-pep8-ubuntu-trusty
|
||||
- gate-monasca-agent-python27-ubuntu-trusty
|
||||
|
|
@ -11272,6 +11266,8 @@ projects:
|
|||
- gate-monasca-api-build
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-trusty
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-xenial
|
||||
gate:
|
||||
- gate-monasca-api-pep8-ubuntu-trusty
|
||||
- gate-monasca-api-python27-ubuntu-trusty
|
||||
|
|
@ -11280,11 +11276,10 @@ projects:
|
|||
- gate-monasca-api-build
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-trusty
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-xenial
|
||||
post:
|
||||
- monasca-api-localrepo-upload
|
||||
experimental:
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
|
||||
|
||||
- name: openstack/monasca-ceilometer
|
||||
template:
|
||||
|
|
@ -11313,6 +11308,8 @@ projects:
|
|||
- gate-monasca-common-build
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
|
||||
gate:
|
||||
- gate-monasca-common-pep8-ubuntu-trusty
|
||||
- gate-monasca-common-python27-ubuntu-trusty
|
||||
|
|
@ -11373,6 +11370,8 @@ projects:
|
|||
- gate-monasca-notification-python27-ubuntu-xenial
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
|
||||
gate:
|
||||
- gate-monasca-notification-pep8-ubuntu-trusty
|
||||
- gate-monasca-notification-python27-ubuntu-trusty
|
||||
|
|
@ -11392,6 +11391,8 @@ projects:
|
|||
- gate-monasca-persister-build
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
|
||||
gate:
|
||||
- gate-monasca-persister-pep8-ubuntu-trusty
|
||||
- gate-monasca-persister-python27-ubuntu-trusty
|
||||
|
|
@ -11399,6 +11400,7 @@ projects:
|
|||
- gate-monasca-persister-python27-ubuntu-xenial
|
||||
- gate-monasca-persister-build
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-trusty
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial
|
||||
post:
|
||||
- monasca-persister-localrepo-upload
|
||||
|
||||
|
|
@ -11414,6 +11416,8 @@ projects:
|
|||
- gate-monasca-statsd-python27-ubuntu-xenial
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
|
||||
gate:
|
||||
- gate-monasca-statsd-pep8-ubuntu-trusty
|
||||
- gate-monasca-statsd-python27-ubuntu-trusty
|
||||
|
|
@ -11427,6 +11431,8 @@ projects:
|
|||
- gate-monasca-thresh-build
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-trusty-nv
|
||||
- gate-tempest-dsvm-monasca-python-full-ubuntu-xenial-nv
|
||||
- gate-tempest-dsvm-monasca-java-full-ubuntu-xenial-nv
|
||||
gate:
|
||||
- gate-monasca-thresh-build
|
||||
post:
|
||||
|
|
|
|||
Loading…
Reference in New Issue