Merge "Revert "Revert "Update jenkins jobs to optionally allow trusty"""

2014-06-24 16:28:00 +00:00 · 2014-06-24 16:28:00 +00:00 · 76d6bd420c
commit 76d6bd420c
parent 036cb0ef31 2da6d623e0
14 changed files with 43 additions and 64 deletions
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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:
--- 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
--- 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
--- 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
--- 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:
--- 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:
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@ -640,7 +640,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
@ -1011,8 +1011,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
@ -2425,9 +2423,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:
@ -2621,9 +2616,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
@ -4375,7 +4367,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