diff --git a/modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml b/modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml index 24fe684099..80d29ea128 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/barbican.yaml @@ -1,6 +1,6 @@ - job: name: gate-barbican-devstack-dsvm - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml b/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml index 19e1c2262f..ae05b6e2b5 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/blazar.yaml @@ -1,6 +1,6 @@ - job: name: gate-blazar-devstack-dsvm - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml index 25d0a9c2bc..5eccef14ff 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/designate.yaml @@ -1,6 +1,6 @@ - job: name: gate-designate-devstack-dsvm - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml index 0512ab035a..832c13f046 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/heat.yaml @@ -1,6 +1,6 @@ - job: name: gate-heat-templates-dsvm - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml b/modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml index 0faf7cfb3a..49afeb52c1 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/magnetodb.yaml @@ -1,6 +1,6 @@ - job: name: gate-magnetodb-devstack-dsvm - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml index 2587b5f0ca..cf8886205e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/manila.yaml @@ -1,6 +1,6 @@ - job: name: gate-manila-tempest-dsvm-neutron - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: @@ -41,7 +41,7 @@ - job: name: gate-manila-tempest-dsvm-neutron-multibackend - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml b/modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml index 441919ae78..cb984cda22 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/mistral.yaml @@ -1,6 +1,6 @@ - job: name: gate-mistral-devstack-dsvm - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml b/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml index e146a20dca..9b6a6095bc 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/murano.yaml @@ -1,6 +1,6 @@ - job: name: gate-murano-devstack-dsvm - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml index 12cd3a27ab..3bc55098c1 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/oslo.yaml @@ -55,11 +55,11 @@ jobs: - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '' branch-override: default - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}': pipeline: gate - node: 'devstack-precise || devstack-trusty' + node: devstack-precise branch-designator: '' branch-override: default diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index 3d981a5aef..0531790272 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -306,12 +306,12 @@ env: 27sa07 - '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '' branch-override: default - '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}': pipeline: gate - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise' branch-designator: '' branch-override: default - hook-{name}-rtfd @@ -1105,27 +1105,27 @@ - translation-jobs - '{pipeline}-neutron-dsvm-functional{branch-designator}': pipeline: gate - node: 'devstack-precise || devstack-trusty' + node: devstack-precise branch-designator: '' branch-override: default - '{pipeline}-neutron-dsvm-functional{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '' branch-override: default - '{pipeline}-neutron-dsvm-api{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '' branch-override: default - devstack-jobs: pipeline: gate - node: 'devstack-precise || devstack-trusty' + node: devstack-precise branch-designator: '-2' branch-override: default - devstack-jobs: pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '-2' branch-override: default @@ -1411,17 +1411,17 @@ envlist: func - '{pipeline}-swift-dsvm-functional{branch-designator}': pipeline: gate - node: 'devstack-precise || devstack-trusty' + node: devstack-precise branch-designator: '' branch-override: default - '{pipeline}-swift-dsvm-functional{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '' branch-override: default - '{pipeline}-swift-dsvm-functional{branch-designator}': pipeline: periodic - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '-havana' branch-override: stable/havana # No one is interested in stable/ branches on swift, so don't run bitrot jobs @@ -1447,50 +1447,61 @@ # Normal gate and check jobs - devstack-jobs: pipeline: gate - node: 'devstack-precise || devstack-trusty' + node: devstack-precise branch-designator: '' branch-override: default - devstack-jobs: pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' + branch-designator: '' + branch-override: default + - devstack-jobs: + pipeline: experimental + node: 'dsvm-precise-krnl' branch-designator: '' branch-override: default # Stable gate jobs for branchless tempest - devstack-jobs: pipeline: gate - node: 'devstack-precise || devstack-trusty' + node: devstack-precise branch-designator: '-icehouse' branch-override: stable/icehouse # Stable check jobs for testing devstack gate - devstack-jobs: pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '-havana' branch-override: stable/havana - devstack-jobs: pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '-icehouse' branch-override: stable/icehouse # Periodic jobs for various branches - devstack-jobs: pipeline: periodic - node: 'devstack-precise || devstack-trusty' + node: devstack-precise branch-designator: '-havana' branch-override: stable/havana - devstack-jobs: pipeline: periodic - node: 'devstack-precise || devstack-trusty' + node: devstack-precise branch-designator: '-icehouse' branch-override: stable/icehouse - devstack-jobs: pipeline: periodic - node: 'devstack-precise || devstack-trusty' + node: devstack-precise branch-designator: '-master' branch-override: master # Special jobs for devstack-gate - devstack-gate-jobs: - node: 'devstack-precise || devstack-trusty' + node: devstack-precise + # Trusty node testing + - devstack-jobs: + pipeline: check + node: 'devstack-trusty' + branch-designator: '-trusty' + branch-override: default - project: @@ -1507,10 +1518,10 @@ jobs: - '{pipeline}-requirements-integration-dsvm': pipeline: gate - node: 'devstack-precise || devstack-trusty' + node: devstack-precise - '{pipeline}-requirements-integration-dsvm': pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' - project: name: tempest @@ -2075,17 +2086,17 @@ - translation-jobs - '{pipeline}-tempest-dsvm-ironic{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' branch-designator: '-nv' branch-override: default @@ -2330,6 +2341,8 @@ node: bare-precise - gate-rally-install-{node}: node: bare-centos6 + - 'check-rally-cli': + node: 'devstack-precise || devstack-precise-check' - project: name: python-rallyclient diff --git a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml index e8f6b6e8f5..9c13d87b0f 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/rally.yaml @@ -54,7 +54,7 @@ - job-template: name: 'check-rally-dsvm-{name}' - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' wrappers: - timeout: @@ -75,7 +75,7 @@ - job-template: name: 'check-rally-dsvm-neutron-{name}' - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise || devstack-precise-check' wrappers: - timeout: @@ -95,8 +95,8 @@ - job: - name: 'check-rally-dsvm-cli' - node: 'devstack-precise || devstack-trusty' + name: 'check-rally-cli' + node: 'devstack-precise || devstack-precise-check' builders: - link-logs diff --git a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml index bebc0c8e6d..529c9bcbc2 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/solum.yaml @@ -1,6 +1,6 @@ - job: name: gate-solum-devstack-dsvm - node: 'devstack-precise || devstack-trusty' + node: devstack-precise wrappers: - timeout: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml b/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml index 9546dc072b..ca257573a4 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/trove.yaml @@ -29,7 +29,7 @@ - job-template: name: 'gate-trove-functional-dsvm-{datastore}' - node: 'devstack-precise || devstack-trusty' + node: 'devstack-precise' wrappers: - timeout: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index c04732a966..cb00d8d9ac 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -637,7 +637,7 @@ jobs: voting: false - name: gate-tomograph-python33 voting: false - - name: check-rally-dsvm-cli + - name: check-rally-cli voting: false - name: gate-stevedore-docs voting: false @@ -1008,6 +1008,8 @@ projects: - check-neutron-dsvm-api - gate-grenade-dsvm-neutron-forward - neutron-upstream-translation-update + - experimental-tempest-dsvm-neutron + - experimental-tempest-dsvm-neutron-pg experimental-tripleo: - check-tripleo-ironic-seed-precise - check-tripleo-undercloud-precise @@ -2411,6 +2413,9 @@ projects: - check-tempest-master-dsvm-full-havana - check-tempest-master-dsvm-neutron-havana - check-tempest-dsvm-f20 + - check-tempest-dsvm-full-trusty + - check-tempest-dsvm-neutron-trusty + - check-grenade-dsvm-trusty - name: openstack-dev/grenade check: @@ -2604,6 +2609,9 @@ projects: - check-tempest-master-dsvm-full-havana - check-tempest-master-dsvm-neutron-havana - check-tempest-dsvm-f20 + - check-tempest-dsvm-full-trusty + - check-tempest-dsvm-neutron-trusty + - check-grenade-dsvm-trusty experimental-tripleo: - check-tripleo-ironic-seed-precise - check-tripleo-undercloud-precise @@ -4353,7 +4361,7 @@ projects: - gate-rally-install-bare-precise - check-rally-dsvm-rally - check-rally-dsvm-neutron-rally - - check-rally-dsvm-cli + - check-rally-cli gate: - gate-rally-pep8 - gate-rally-python26