Merge "Switch all tripleo tests to use Ironic"

jenkins/jobs/tripleo.yaml

@@ -1,45 +1,3 @@
-- job:
-    name: 'check-tripleo-novabm-undercloud-precise-nonha'
-    node: 'tripleo-precise'
-
-    wrappers:
-      - build-timeout:
-          timeout: 125
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
-      - shell: |
-          #!/bin/bash -xe
-          export PYTHONUNBUFFERED=true
-          export DEVSTACK_GATE_TIMEOUT=120
-          export DEVSTACK_GATE_TEMPEST=0
-          export DEVSTACK_GATE_EXERCISES=0
-          export GEARDSERVER=192.168.1.1
-          export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
-          export TRIPLEO_TEST=undercloud
-          export OVERCLOUD_CONTROLSCALE=1
-          export USE_IRONIC=0
-          sudo chown -hR $(whoami) /opt/git
-          function gate_hook {
-              bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
-          }
-          export -f gate_hook
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - scp:
-          site: 'static.openstack.org'
-          files:
-            - target: 'logs/$LOG_PATH'
-              source: 'logs/**'
-              keep-hierarchy: true
-              copy-after-failure: true
-      - console-log
-
 - job:
     name: 'check-tripleo-ironic-undercloud-precise-nonha'
     node: 'tripleo-precise'
@@ -83,7 +41,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-novabm-overcloud-precise-nonha'
+    name: 'check-tripleo-ironic-overcloud-precise-nonha'
     node: 'tripleo-precise'
 
     wrappers:
@@ -105,7 +63,7 @@
           export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
           export TRIPLEO_TEST=overcloud
           export OVERCLOUD_CONTROLSCALE=1
-          export USE_IRONIC=0
+          export USE_IRONIC=1
           sudo chown -hR $(whoami) /opt/git
           function gate_hook {
               bash -xe /opt/stack/new/tripleo-ci/toci_gate_test.sh
@@ -125,7 +83,7 @@
       - console-log
 
 - job:
-    name: 'check-tripleo-novabm-overcloud-f20-nonha'
+    name: 'check-tripleo-ironic-overcloud-f20-nonha'
     node: 'tripleo-f20'
 
     wrappers:
@@ -146,7 +104,7 @@
           export GEARDSERVER=192.168.1.1
           export DIB_COMMON_ELEMENTS="common-venv stackuser pypi-openstack"
           export TRIPLEO_TEST=overcloud
-          export USE_IRONIC=0
+          export USE_IRONIC=1
           sudo chown -hR $(whoami) /opt/git
           export OVERCLOUD_CONTROLSCALE=1
           export USE_CIRROS=1

zuul/layout.yaml

@@ -858,8 +858,8 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     pre-release:
       - cinder-tarball
     release:
@@ -928,10 +928,9 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     pre-release:
       - glance-tarball
     release:
@@ -968,10 +967,9 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     pre-release:
       - glance_store-tarball
     release:
@@ -994,14 +992,13 @@ projects:
     post:
       - heat-coverage
     check-tripleo:
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     experimental:
       - gate-rally-dsvm-fakevirt-heat
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
       - check-tripleo-ironic-overcloud-precise-ha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     pre-release:
       - heat-tarball
     release:
@@ -1037,10 +1034,9 @@ projects:
       - gate-horizon-dsvm-integration
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     pre-release:
       - horizon-tarball
     release:
@@ -1105,10 +1101,9 @@ projects:
       - gate-grenade-dsvm-forward
       - gate-keystone-python33
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     pre-release:
       - keystone-tarball
     release:
@@ -1194,10 +1189,9 @@ projects:
       - gate-grenade-dsvm-neutron-forward
       - check-grenade-dsvm-neutron-sideways
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     pre-release:
       - neutron-tarball
     release:
@@ -1242,10 +1236,9 @@ projects:
     silent:
       - check-tempest-dsvm-docker
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     pre-release:
       - nova-tarball
     release:
@@ -1320,10 +1313,9 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     pre-release:
       - swift-tarball
     release:
@@ -1390,9 +1382,8 @@ projects:
       - tuskar-coverage
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     pre-release:
       - tuskar-tarball
     release:
@@ -1485,10 +1476,9 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/python-designateclient
     template:
@@ -1520,10 +1510,9 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/python-glanceclient
     template:
@@ -1546,10 +1535,9 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
 #TODO: add docs
   - name: openstack/python-heatclient
@@ -1575,10 +1563,9 @@ projects:
       - python-heatclient-branch-tarball
       - python-heatclient-coverage
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     release:
       - python-heatclient-docs
 
@@ -1620,10 +1607,9 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/python-keystoneclient-federation
     template:
@@ -1681,10 +1667,9 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/python-novaclient
     template:
@@ -1707,10 +1692,9 @@ projects:
     experimental:
       - gate-grenade-dsvm-forward
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/python-openstackclient
     template:
@@ -1763,10 +1747,9 @@ projects:
     post:
       - python-swiftclient-coverage
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/python-troveclient
     template:
@@ -1791,9 +1774,8 @@ projects:
       - python-tuskarclient-coverage
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/python-zaqarclient
     template:
@@ -1880,10 +1862,9 @@ projects:
     gate:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/oslo.db
     template:
@@ -1903,10 +1884,9 @@ projects:
     gate:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/oslo.i18n
     template:
@@ -1925,10 +1905,9 @@ projects:
     post:
       - oslo.i18n-coverage
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/oslo.log
     template:
@@ -1958,10 +1937,9 @@ projects:
     gate:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/oslo.middleware
     template:
@@ -1997,10 +1975,9 @@ projects:
     post:
       - oslo.rootwrap-branch-tarball
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/oslo.serialization
     template:
@@ -2038,10 +2015,9 @@ projects:
     gate:
       - gate-devstack-dsvm-cells
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack/oslo.vmware
     template:
@@ -2114,10 +2090,9 @@ projects:
       - name: publish-to-pypi
       - name: noop-jobs
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     post:
       - dib-utils-branch-tarball
 
@@ -2134,10 +2109,9 @@ projects:
       - gate-diskimage-builder-python27
       - check-tempest-dsvm-ironic-pxe_ssh
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     gate:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
@@ -2238,10 +2212,9 @@ projects:
       - gate-os-apply-config-python26
       - gate-os-apply-config-python27
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     gate:
       - gate-os-apply-config-pep8
       - gate-os-apply-config-python26
@@ -2261,10 +2234,9 @@ projects:
       - os-cloud-config-docs
       - os-cloud-config-coverage
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
 
 #TODO: add docs
   - name: openstack/os-collect-config
@@ -2278,10 +2250,9 @@ projects:
       - gate-os-collect-config-python26
       - gate-os-collect-config-python27
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     gate:
       - gate-os-collect-config-pep8
       - gate-os-collect-config-python26
@@ -2301,10 +2272,9 @@ projects:
       - gate-os-net-config-python26
       - gate-os-net-config-python27
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     gate:
       - gate-os-net-config-pep8
       - gate-os-net-config-python26
@@ -2325,10 +2295,9 @@ projects:
       - gate-os-refresh-config-python26
       - gate-os-refresh-config-python27
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     gate:
       - gate-os-refresh-config-pep8
       - gate-os-refresh-config-python26
@@ -2357,10 +2326,9 @@ projects:
     post:
       - propose-requirements-updates
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
 # TODO: add docs
   - name: openstack/sahara-dashboard
@@ -2489,10 +2457,9 @@ projects:
       - check-tempest-dsvm-f20
       - check-tempest-dsvm-ironic-parallel-nv
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     post:
       - tempest-docs
       - tempest-coverage
@@ -2559,11 +2526,10 @@ projects:
       - name: publish-to-pypi
       - name: noop-jobs
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     post:
       - tripleo-heat-templates-branch-tarball
     pre-release:
@@ -2577,11 +2543,10 @@ projects:
       - name: publish-to-pypi
       - name: noop-jobs
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     post:
       - tripleo-image-elements-branch-tarball
 
@@ -2591,11 +2556,10 @@ projects:
     check:
       - gate-tripleo-incubator-docs
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     gate:
       - gate-tripleo-incubator-docs
     experimental-tripleo:
@@ -2612,11 +2576,10 @@ projects:
       - name: merge-check
       - name: python-jobs
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
       - check-tripleo-ironic-overcloud-precise-ha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
     post:
       - tripleo-puppet-elements-branch-tarball
 
@@ -2659,10 +2622,9 @@ projects:
       - gate-tuskar-ui-selenium
       - gate-tuskar-ui-jshint
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     post:
       - tuskar-ui-branch-tarball
 
@@ -2912,10 +2874,9 @@ projects:
     post:
       - pbr-coverage
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
     post:
       - pbr-docs
     pre-release:
@@ -3018,10 +2979,9 @@ projects:
       - experimental-tempest-dsvm-full-dibtest
       - experimental-tempest-dsvm-neutron-full-dibtest
     experimental-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
 
   - name: openstack-infra/elastic-recheck
     template:
@@ -3425,10 +3385,9 @@ projects:
       - name: merge-check
       - name: noop-jobs
     check-tripleo:
-      - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
-      - check-tripleo-novabm-overcloud-f20-nonha
-      - check-tripleo-novabm-overcloud-precise-nonha
+      - check-tripleo-ironic-overcloud-f20-nonha
+      - check-tripleo-ironic-overcloud-precise-nonha
 
   - name: openstack-infra/vinz
     template: