From 4bfa080fd9df47d47c1fd25c7137c0c57ad2a1e3 Mon Sep 17 00:00:00 2001
From: Robert Collins <rbtcollins@hp.com>
Date: Mon, 14 Jul 2014 15:17:07 +1200
Subject: [PATCH] Rename jobs for clarity.

The other jobs have ironic in their name, but we're changing defaults
soon so this should really be clearer.

Change-Id: I2803732e817b3e8fe0da4e57c340d8ac584cf885
---
 .../jenkins_job_builder/config/tripleo.yaml   |   8 +-
 .../openstack_project/files/zuul/layout.yaml  | 178 +++++++++---------
 2 files changed, 93 insertions(+), 93 deletions(-)

diff --git a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
index 5fdc7524ea..be5cac6bc1 100644
--- a/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
+++ b/modules/openstack_project/files/jenkins_job_builder/config/tripleo.yaml
@@ -39,7 +39,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-undercloud-precise'
+    name: 'check-tripleo-novabm-undercloud-precise'
     node: 'tripleo-precise'
 
     wrappers:
@@ -119,7 +119,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-overcloud-precise'
+    name: 'check-tripleo-novabm-overcloud-precise'
     node: 'tripleo-precise'
 
     wrappers:
@@ -159,7 +159,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-overcloud-f20'
+    name: 'check-tripleo-novabm-overcloud-f20'
     node: 'tripleo-f20'
 
     wrappers:
@@ -198,7 +198,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-vlan-precise'
+    name: 'check-tripleo-ironic-vlan-precise'
     node: 'tripleo-precise'
 
     wrappers:
diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml
index 89bf9bf042..7b19fe9d6b 100644
--- a/modules/openstack_project/files/zuul/layout.yaml
+++ b/modules/openstack_project/files/zuul/layout.yaml
@@ -779,7 +779,7 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - cinder-tarball
     release:
@@ -877,9 +877,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - glance-tarball
     release:
@@ -912,9 +912,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - glance.store-tarball
     release:
@@ -934,9 +934,9 @@ projects:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - heat-tarball
     release:
@@ -1029,9 +1029,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - keystone-tarball
     release:
@@ -1103,9 +1103,9 @@ projects:
       - gate-grenade-dsvm-neutron-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - neutron-tarball
     release:
@@ -1147,9 +1147,9 @@ projects:
       - check-tempest-dsvm-nova-v3-full
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - nova-tarball
     release:
@@ -1233,9 +1233,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - swift-tarball
     release:
@@ -1280,11 +1280,11 @@ projects:
       - name: python-jobs
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-undercloud-precise
+      - check-tripleo-novabm-overcloud-f20
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     pre-release:
       - tuskar-tarball
     release:
@@ -1348,9 +1348,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-designateclient
     template:
@@ -1382,9 +1382,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-glanceclient
     template:
@@ -1409,9 +1409,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
 #TODO: add docs
   - name: openstack/python-heatclient
@@ -1439,9 +1439,9 @@ projects:
       - python-heatclient-coverage
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     release:
       - python-heatclient-docs
 
@@ -1488,9 +1488,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-marconiclient
     template:
@@ -1528,9 +1528,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-novaclient
     template:
@@ -1556,9 +1556,9 @@ projects:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-openstackclient
     template:
@@ -1604,9 +1604,9 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/python-troveclient
     template:
@@ -1631,8 +1631,8 @@ projects:
       - gate-python-tuskarclient-python33
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-undercloud-precise
+      - check-tripleo-novabm-overcloud-precise
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
 
@@ -1649,9 +1649,9 @@ projects:
       - gate-diskimage-builder-python27
       - check-tempest-dsvm-virtual-ironic
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
@@ -1659,7 +1659,7 @@ projects:
       - gate-tempest-dsvm-virtual-ironic
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - diskimage-builder-coverage
       - diskimage-builder-branch-tarball
@@ -1671,13 +1671,13 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - noop
     experimental-tripleo:
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
       - check-tripleo-ironic-seed-precise
     post:
       - dib-utils-branch-tarball
@@ -1793,16 +1793,16 @@ projects:
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-os-apply-config-pep8
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - os-apply-config-coverage
       - os-apply-config-branch-tarball
@@ -1816,16 +1816,16 @@ projects:
       - gate-os-cloud-config-python26
       - gate-os-cloud-config-python27
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-os-cloud-config-pep8
       - gate-os-cloud-config-python26
       - gate-os-cloud-config-python27
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - os-cloud-config-docs
       - os-cloud-config-coverage
@@ -1841,16 +1841,16 @@ projects:
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-os-collect-config-pep8
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - os-collect-config-coverage
       - os-collect-config-branch-tarball
@@ -1865,16 +1865,16 @@ projects:
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-os-refresh-config-pep8
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - os-refresh-config-coverage
       - os-refresh-config-branch-tarball
@@ -1940,9 +1940,9 @@ projects:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.db
     template:
@@ -1962,9 +1962,9 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.i18n
     template:
@@ -1983,9 +1983,9 @@ projects:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.messaging
     template:
@@ -2006,9 +2006,9 @@ projects:
       - gate-tempest-dsvm-neutron-large-ops
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
 #TODO: add docs
   - name: openstack/oslo.rootwrap
@@ -2036,9 +2036,9 @@ projects:
       - oslo.rootwrap-branch-tarball
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.utils
     template:
@@ -2069,9 +2069,9 @@ projects:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack/oslo.vmware
     template:
@@ -2110,9 +2110,9 @@ projects:
       - propose-requirements-updates
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
 # TODO: add docs
   - name: openstack/sahara-dashboard
@@ -2257,9 +2257,9 @@ projects:
       - check-tempest-master-dsvm-neutron-havana
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - tempest-docs
       - tempest-coverage
@@ -2285,14 +2285,14 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - noop
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - tripleo-heat-templates-branch-tarball
     pre-release:
@@ -2306,14 +2306,14 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - noop
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - tripleo-image-elements-branch-tarball
 
@@ -2321,15 +2321,15 @@ projects:
     check:
       - gate-tripleo-incubator-docs
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - gate-tripleo-incubator-docs
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
-      - check-tripleo-vlan-precise
+      - check-tripleo-novabm-overcloud-precise
+      - check-tripleo-ironic-vlan-precise
     post:
       - tripleo-incubator-docs
     pre-release:
@@ -2370,9 +2370,9 @@ projects:
       - gate-tuskar-ui-selenium
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - tuskar-ui-branch-tarball
 
@@ -2614,9 +2614,9 @@ projects:
       - gate-swift-dsvm-functional
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
     post:
       - pbr-docs
     pre-release:
@@ -2731,9 +2731,9 @@ projects:
       - check-tempest-dsvm-f20
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack-infra/elastic-recheck
     check:
@@ -3128,14 +3128,14 @@ projects:
     check:
       - noop
     check-tripleo:
-      - check-tripleo-undercloud-precise
+      - check-tripleo-novabm-undercloud-precise
       - check-tripleo-ironic-undercloud-precise
-      - check-tripleo-overcloud-f20
+      - check-tripleo-novabm-overcloud-f20
     gate:
       - noop
     experimental-tripleo:
       - check-tripleo-ironic-seed-precise
-      - check-tripleo-overcloud-precise
+      - check-tripleo-novabm-overcloud-precise
 
   - name: openstack-infra/zmq-event-publisher
     check: