Merge "Consolidate and rename Ironic jobs"

modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml

@@ -474,96 +474,22 @@
       - devstack-logs
       - console-log
 
-
+- builder:
-- job-template:
+    # NOTE(adam_g): This is a temporary macro until we can define the Ironic d-s-g job in a
-    name: '{pipeline}-tempest-dsvm-ironic{branch-designator}'
+    # standard, minimal fashion.
-    node: '{node}'
+    name: devstack-virtual-ironic
-
-    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=1
-          export DEVSTACK_GATE_IRONIC=1
-          export DEVSTACK_GATE_SMOKE_SERIAL=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
-- job-template:
-    name: '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}'
-    node: '{node}'
-
-    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=1
-          export DEVSTACK_GATE_POSTGRES=1
-          export DEVSTACK_GATE_IRONIC=1
-          export DEVSTACK_GATE_SMOKE_SERIAL=1
-          export BRANCH_OVERRIDE={branch-override}
-          if [ "$BRANCH_OVERRIDE" != "default" ] ; then
-              export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
-          fi
-
-          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-          ./safe-devstack-vm-gate-wrap.sh
-
-    publishers:
-      - devstack-logs
-      - console-log
-
-
-- job-template:
-    name: '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}'
-    node: '{node}'
-
-    wrappers:
-      - build-timeout:
-          timeout: 125
-      - timestamps
-
-    builders:
-      - link-logs
-      - net-info
-      - devstack-checkout
       - shell: |
           #!/bin/bash -xe
           export PYTHONUNBUFFERED=true
           export DEVSTACK_GATE_TEMPEST_DISABLE_TENANT_ISOLATION=1
           export DEVSTACK_GATE_TIMEOUT=120
           export DEVSTACK_GATE_TEMPEST=1
+          export DEVSTACK_GATE_POSTGRES={postgres}
           export DEVSTACK_GATE_IRONIC=1
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_VIRT_DRIVER=ironic
+          export DEVSTACK_GATE_IRONIC_DRIVER={deploy_driver}
           export TEMPEST_CONCURRENCY=1
           export BRANCH_OVERRIDE={branch-override}
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
@@ -603,10 +529,48 @@
           cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
           ./safe-devstack-vm-gate-wrap.sh
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - devstack-virtual-ironic:
+          postgres: 0
+          deploy_driver: pxe_ssh
+          branch-override: '{branch-override}'
     publishers:
       - devstack-logs
       - console-log
 
+- job-template:
+    name: '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}'
+    node: '{node}'
+
+    wrappers:
+      - build-timeout:
+          timeout: 125
+      - timestamps
+
+    builders:
+      - link-logs
+      - net-info
+      - devstack-checkout
+      - devstack-virtual-ironic:
+          postgres: 1
+          deploy_driver: pxe_ssh
+          branch-override: '{branch-override}'
+
+    publishers:
+      - devstack-logs
+      - console-log
 
 - job-template:
     name: '{pipeline}-tempest-dsvm-zaqar{branch-designator}'
@@ -1514,9 +1478,8 @@
       - '{pipeline}-grenade-dsvm-partial-ncpu{branch-designator}'
       - '{pipeline}-grenade-dsvm-ironic-sideways{branch-designator}'
       - '{pipeline}-grenade-dsvm-neutron-sideways{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic{branch-designator}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}'
-      - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}'
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}'
-      - '{pipeline}-tempest-dsvm-virtual-ironic{branch-designator}'
       - '{pipeline}-tempest-dsvm-zaqar{branch-designator}'
       - '{pipeline}-tempest-dsvm-all{branch-designator}'
       - '{pipeline}-tempest-dsvm-coverage{branch-designator}'

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -2283,17 +2283,12 @@
       - python-jobs
       - openstack-publish-jobs
       - translation-jobs
-      - '{pipeline}-tempest-dsvm-ironic{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh{branch-designator}':
           pipeline: check
           node: 'devstack-precise || devstack-trusty'
           branch-designator: '-nv'
           branch-override: default
-      - '{pipeline}-tempest-dsvm-ironic-postgres{branch-designator}':
+      - '{pipeline}-tempest-dsvm-ironic-pxe_ssh-postgres{branch-designator}':
-          pipeline: 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-trusty'
           branch-designator: '-nv'

modules/openstack_project/files/zuul/layout.yaml

@@ -501,12 +501,10 @@ jobs:
   - name: check-heat-dsvm-functional
     branch: ^(?!stable/(havana|icehouse)).*$
     voting: false
-  - name: check-tempest-dsvm-ironic-nv
+  - name: check-tempest-dsvm-ironic-pxe_ssh-nv
     voting: false
-  - name: check-tempest-dsvm-ironic-postgres-nv
-    voting: false
-  - name: check-tempest-dsvm-virtual-ironic-nv
     branch: ^(?!stable/havana).*$
+  - name: check-tempest-dsvm-ironic-pxe_ssh-postgres-nv
     voting: false
   - name: ^(gate|check)-tempest-dsvm-cells$
     voting: false
@@ -1083,15 +1081,13 @@ projects:
       - name: check-requirements
       - name: translation-jobs
     check:
-      - check-tempest-dsvm-ironic
+      - check-tempest-dsvm-ironic-pxe_ssh
-      - check-tempest-dsvm-ironic-postgres
+      - check-tempest-dsvm-ironic-pxe_ssh-postgres
-      - check-tempest-dsvm-virtual-ironic
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise-nonha
     gate:
-      - gate-tempest-dsvm-ironic
+      - gate-tempest-dsvm-ironic-pxe_ssh
-      - gate-tempest-dsvm-ironic-postgres
+      - gate-tempest-dsvm-ironic-pxe_ssh-postgres
-      - gate-tempest-dsvm-virtual-ironic
     experimental:
       - check-grenade-dsvm-ironic-sideways
     pre-release:
@@ -1259,7 +1255,7 @@ projects:
       - check-devstack-dsvm-cells
       - gate-nova-pylint
       - check-grenade-dsvm-partial-ncpu
-      - check-tempest-dsvm-virtual-ironic-nv
+      - check-tempest-dsvm-ironic-pxe_ssh-nv
     gate:
       - gate-devstack-dsvm-cells
       - gate-grenade-dsvm-partial-ncpu
@@ -1595,14 +1591,12 @@ projects:
       - name: publish-to-pypi
     check:
       - gate-python-ironicclient-pypy
-      - check-tempest-dsvm-ironic
+      - check-tempest-dsvm-ironic-pxe_ssh
-      - check-tempest-dsvm-virtual-ironic
     check-tripleo:
       - check-tripleo-ironic-undercloud-precise-nonha
     gate:
       - gate-python-ironicclient-pypy
-      - gate-tempest-dsvm-ironic
+      - gate-tempest-dsvm-ironic-pxe_ssh
-      - gate-tempest-dsvm-virtual-ironic
 
   - name: openstack/python-keystoneclient
     template:
@@ -1791,7 +1785,7 @@ projects:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
       - gate-diskimage-builder-python27
-      - check-tempest-dsvm-virtual-ironic
+      - check-tempest-dsvm-ironic-pxe_ssh
     check-tripleo:
       - check-tripleo-novabm-undercloud-precise-nonha
       - check-tripleo-ironic-undercloud-precise-nonha
@@ -1800,7 +1794,7 @@ projects:
       - gate-diskimage-builder-pep8
       - gate-diskimage-builder-python26
       - gate-diskimage-builder-python27
-      - gate-tempest-dsvm-virtual-ironic
+      - gate-tempest-dsvm-ironic-pxe_ssh
     experimental-tripleo:
       - check-tripleo-novabm-overcloud-precise-nonha
     post:
@@ -2463,8 +2457,8 @@ projects:
       - gate-tempest-docs
       - gate-tempest-python27
       - check-grenade-dsvm-partial-ncpu
-      - check-tempest-dsvm-ironic-nv
+      - check-tempest-dsvm-ironic-pxe_ssh-nv
-      - check-tempest-dsvm-ironic-postgres-nv
+      - check-tempest-dsvm-ironic-pxe_ssh-postgres-nv
       # icehouse compat jobs for tempest master
       - check-tempest-dsvm-full-icehouse
       - check-tempest-dsvm-neutron-icehouse
@@ -2473,7 +2467,6 @@ projects:
       - check-grenade-dsvm-neutron-icehouse
       - check-tempest-dsvm-postgres-full-icehouse
       - check-tempest-dsvm-neutron-full-icehouse
-      - check-tempest-dsvm-virtual-ironic-nv
       - gate-tempest-dsvm-large-ops-icehouse
       - gate-tempest-dsvm-neutron-large-ops-icehouse
       - check-grenade-dsvm-partial-ncpu-icehouse
@@ -2536,8 +2529,8 @@ projects:
       - gate-tempest-lib-python34
       - gate-tempest-lib-pypy
       - check-grenade-dsvm-partial-ncpu
-      - check-tempest-dsvm-ironic-nv
+      - check-tempest-dsvm-ironic-pxe_ssh-nv
-      - check-tempest-dsvm-ironic-postgres-nv
+      - check-tempest-dsvm-ironic-pxe_ssh-postgres-nv
       # icehouse compat jobs for tempest master
       - check-tempest-dsvm-full-icehouse
       - check-tempest-dsvm-neutron-icehouse
@@ -2546,7 +2539,6 @@ projects:
       - check-grenade-dsvm-neutron-icehouse
       - check-tempest-dsvm-postgres-full-icehouse
       - check-tempest-dsvm-neutron-full-icehouse
-      - check-tempest-dsvm-virtual-ironic-nv
       - gate-tempest-dsvm-large-ops-icehouse
       - gate-tempest-dsvm-neutron-large-ops-icehouse
       - check-grenade-dsvm-partial-ncpu-icehouse
@@ -2802,9 +2794,8 @@ projects:
       - check-grenade-dsvm-partial-ncpu
       - check-neutron-dsvm-functional
       - check-swift-dsvm-functional
-      - check-tempest-dsvm-ironic-nv
+      - check-tempest-dsvm-ironic-pxe_ssh-nv
-      - check-tempest-dsvm-ironic-postgres-nv
+      - check-tempest-dsvm-ironic-pxe_ssh-postgres-nv
-      - check-tempest-dsvm-virtual-ironic-nv
       - check-tempest-dsvm-f20
     gate:
       - gate-devstack-bashate
@@ -3000,9 +2991,8 @@ projects:
       - check-tempest-dsvm-neutron-havana
       - check-tempest-dsvm-postgres-full-havana
       - check-devstack-dsvm-cells-havana
-      - check-tempest-dsvm-ironic-nv
+      - check-tempest-dsvm-ironic-pxe_ssh-nv
-      - check-tempest-dsvm-ironic-postgres-nv
+      - check-tempest-dsvm-ironic-pxe_ssh-postgres-nv
-      - check-tempest-dsvm-virtual-ironic-nv
       - check-tempest-dsvm-f20
     gate:
       - gate-devstack-gate-unittests