From dc2189faf0956f1c72e9de319c5371d3b29c7b44 Mon Sep 17 00:00:00 2001 From: Clark Boylan Date: Mon, 23 Jun 2014 17:05:17 -0700 Subject: [PATCH] Revert "Revert "Update jenkins jobs to optionally allow trusty"" This reverts commit 607b2f2ab4962dec4f4400ecc4687db2b206003a. Jenkins masters have all had their gearman plugin updating which makes them register jobs properly. Conflicts: modules/openstack_project/files/zuul/layout.yaml Change-Id: I3edeb26c9a1d3878b80266ea32d333bd8fc2f67e --- .../jenkins_job_builder/config/barbican.yaml | 2 +- .../jenkins_job_builder/config/blazar.yaml | 2 +- .../jenkins_job_builder/config/designate.yaml | 2 +- .../jenkins_job_builder/config/heat.yaml | 2 +- .../jenkins_job_builder/config/magnetodb.yaml | 2 +- .../jenkins_job_builder/config/manila.yaml | 4 +- .../jenkins_job_builder/config/mistral.yaml | 2 +- .../jenkins_job_builder/config/murano.yaml | 2 +- .../jenkins_job_builder/config/oslo.yaml | 4 +- .../jenkins_job_builder/config/projects.yaml | 61 ++++++++----------- .../jenkins_job_builder/config/rally.yaml | 8 +-- .../jenkins_job_builder/config/solum.yaml | 2 +- .../jenkins_job_builder/config/trove.yaml | 2 +- .../openstack_project/files/zuul/layout.yaml | 12 +--- 14 files changed, 43 insertions(+), 64 deletions(-) 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 80d29ea128..24fe684099 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 + node: 'devstack-precise || devstack-trusty' 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 ae05b6e2b5..19e1c2262f 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 + node: 'devstack-precise || devstack-trusty' 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 5eccef14ff..25d0a9c2bc 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 + node: 'devstack-precise || devstack-trusty' 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 832c13f046..0512ab035a 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 + node: 'devstack-precise || devstack-trusty' 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 49afeb52c1..0faf7cfb3a 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 + node: 'devstack-precise || devstack-trusty' 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 cf8886205e..2587b5f0ca 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 + node: 'devstack-precise || devstack-trusty' wrappers: - timeout: @@ -41,7 +41,7 @@ - job: name: gate-manila-tempest-dsvm-neutron-multibackend - node: devstack-precise + node: 'devstack-precise || devstack-trusty' 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 cb984cda22..441919ae78 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 + node: 'devstack-precise || devstack-trusty' 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 9b6a6095bc..e146a20dca 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 + node: 'devstack-precise || devstack-trusty' 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 3bc55098c1..12cd3a27ab 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-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default - '{pipeline}-{injectedlib}-dsvm-{name}{branch-designator}': pipeline: gate - node: devstack-precise + node: 'devstack-precise || devstack-trusty' 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 0531790272..3d981a5aef 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-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default - '{pipeline}-sqlalchemy-migrate-devstack-dsvm{branch-designator}': pipeline: gate - node: 'devstack-precise' + node: 'devstack-precise || devstack-trusty' 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 + node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default - '{pipeline}-neutron-dsvm-functional{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default - '{pipeline}-neutron-dsvm-api{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default - devstack-jobs: pipeline: gate - node: devstack-precise + node: 'devstack-precise || devstack-trusty' branch-designator: '-2' branch-override: default - devstack-jobs: pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '-2' branch-override: default @@ -1411,17 +1411,17 @@ envlist: func - '{pipeline}-swift-dsvm-functional{branch-designator}': pipeline: gate - node: devstack-precise + node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default - '{pipeline}-swift-dsvm-functional{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default - '{pipeline}-swift-dsvm-functional{branch-designator}': pipeline: periodic - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '-havana' branch-override: stable/havana # No one is interested in stable/ branches on swift, so don't run bitrot jobs @@ -1447,61 +1447,50 @@ # Normal gate and check jobs - devstack-jobs: pipeline: gate - node: devstack-precise + node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default - devstack-jobs: pipeline: check - node: 'devstack-precise || devstack-precise-check' - branch-designator: '' - branch-override: default - - devstack-jobs: - pipeline: experimental - node: 'dsvm-precise-krnl' + node: 'devstack-precise || devstack-trusty' branch-designator: '' branch-override: default # Stable gate jobs for branchless tempest - devstack-jobs: pipeline: gate - node: devstack-precise + node: 'devstack-precise || devstack-trusty' branch-designator: '-icehouse' branch-override: stable/icehouse # Stable check jobs for testing devstack gate - devstack-jobs: pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '-havana' branch-override: stable/havana - devstack-jobs: pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '-icehouse' branch-override: stable/icehouse # Periodic jobs for various branches - devstack-jobs: pipeline: periodic - node: devstack-precise + node: 'devstack-precise || devstack-trusty' branch-designator: '-havana' branch-override: stable/havana - devstack-jobs: pipeline: periodic - node: devstack-precise + node: 'devstack-precise || devstack-trusty' branch-designator: '-icehouse' branch-override: stable/icehouse - devstack-jobs: pipeline: periodic - node: devstack-precise + node: 'devstack-precise || devstack-trusty' branch-designator: '-master' branch-override: master # Special jobs for devstack-gate - devstack-gate-jobs: - node: devstack-precise - # Trusty node testing - - devstack-jobs: - pipeline: check - node: 'devstack-trusty' - branch-designator: '-trusty' - branch-override: default + node: 'devstack-precise || devstack-trusty' - project: @@ -1518,10 +1507,10 @@ jobs: - '{pipeline}-requirements-integration-dsvm': pipeline: gate - node: devstack-precise + node: 'devstack-precise || devstack-trusty' - '{pipeline}-requirements-integration-dsvm': pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' - project: name: tempest @@ -2086,17 +2075,17 @@ - translation-jobs - '{pipeline}-tempest-dsvm-ironic{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '-nv' branch-override: default - '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}': pipeline: check - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' branch-designator: '-nv' branch-override: default @@ -2341,8 +2330,6 @@ 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 9c13d87b0f..e8f6b6e8f5 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-precise-check' + node: 'devstack-precise || devstack-trusty' wrappers: - timeout: @@ -75,7 +75,7 @@ - job-template: name: 'check-rally-dsvm-neutron-{name}' - node: 'devstack-precise || devstack-precise-check' + node: 'devstack-precise || devstack-trusty' wrappers: - timeout: @@ -95,8 +95,8 @@ - job: - name: 'check-rally-cli' - node: 'devstack-precise || devstack-precise-check' + name: 'check-rally-dsvm-cli' + node: 'devstack-precise || devstack-trusty' 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 529c9bcbc2..bebc0c8e6d 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 + node: 'devstack-precise || devstack-trusty' 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 ca257573a4..9546dc072b 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' + node: 'devstack-precise || devstack-trusty' wrappers: - timeout: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 1ea10fac8c..d7a9abbc05 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -639,7 +639,7 @@ jobs: voting: false - name: gate-rally-install-bare-centos6 voting: false - - name: check-rally-cli + - name: check-rally-dsvm-cli voting: false - name: gate-stevedore-docs voting: false @@ -1010,8 +1010,6 @@ 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 @@ -2418,9 +2416,6 @@ 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: @@ -2614,9 +2609,6 @@ 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 @@ -4366,7 +4358,7 @@ projects: - gate-rally-install-bare-precise - check-rally-dsvm-rally - check-rally-dsvm-neutron-rally - - check-rally-cli + - check-rally-dsvm-cli gate: - gate-rally-pep8 - gate-rally-python26