Cleanup CI jobs for IPA

Renamed jobs to more appropriate names, and extended
base timouts, as well as the build timeouts for coreos
as the image we work with today is a little larger
than it was previously.

Change-Id: I2884ba795bae689b40826b8c7e2714e3eb5811fb
Depends-On: I139679db835b7a87c55f69a4d807ff8ec9099e3a

playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src/run.yaml

@@ -28,7 +28,7 @@
         cmd: |
           cat << 'EOF' >> ironic-extra-vars
             export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
-            export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
+            export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1800
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_CPU=2"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=2048"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"

playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src/run.yaml

@@ -28,7 +28,7 @@
         cmd: |
           cat << 'EOF' >> ironic-extra-vars
             export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
-            export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
+            export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1800
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_CPU=2"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=2048"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"

playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src/run.yaml

@@ -28,7 +28,7 @@
         cmd: |
           cat << 'EOF' >> ironic-extra-vars
             export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
-            export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
+            export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1800
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_CPU=2"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=2048"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"

playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src/run.yaml

@@ -28,7 +28,7 @@
         cmd: |
           cat << 'EOF' >> ironic-extra-vars
             export DEVSTACK_GATE_OS_TEST_TIMEOUT=2400
-            export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1200
+            export DEVSTACK_GATE_TEMPEST_BAREMETAL_BUILD_TIMEOUT=1800
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_CPU=2"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=2048"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=coreos"

zuul.d/legacy-ironic-jobs.yaml

@@ -24,60 +24,60 @@
       - openstack/virtualbmc
 
 - job:
-    name: ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
+    name: ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src
     parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/post.yaml
+    run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src/post.yaml
+    timeout: 7200
+
+- job:
+    name: ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src
+    parent: legacy-ipa-dsvm-base
+    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src/post.yaml
     timeout: 5400
 
 - job:
-    name: ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
+    name: ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src
     parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/post.yaml
-    timeout: 5400
+    run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/post.yaml
+    timeout: 7200
 
 - job:
-    name: ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
+    name: ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src
     parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/post.yaml
-    timeout: 5400
+    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/post.yaml
+    timeout: 7200
 
 - job:
-    name: ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
+    name: ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src
     parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/post.yaml
-    timeout: 5400
+    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/post.yaml
+    timeout: 7200
 
 - job:
-    name: ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
+    name: ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src
     parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/post.yaml
-    timeout: 5400
+    run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/post.yaml
+    timeout: 7200
 
 - job:
-    name: ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
+    name: ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src
     parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/post.yaml
-    timeout: 5400
+    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src/post.yaml
+    timeout: 7200
 
 - job:
-    name: ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
+    name: ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src
     parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/post.yaml
-    timeout: 5400
-
-- job:
-    name: ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
-    parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/post.yaml
-    timeout: 5400
+    run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src/post.yaml
+    timeout: 7200
 
 - job:
     name: ipa-tempest-dsvm-ironic-inspector-src
@@ -105,15 +105,15 @@
     timeout: 1800
 
 - job:
-    name: ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src
+    name: ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa256-src
     parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/post.yaml
-    timeout: 5400
+    run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa256-src/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa256-src/post.yaml
+    timeout: 7200
 
 - job:
-    name: ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3
+    name: ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3
     parent: legacy-ipa-dsvm-base
-    run: playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/run.yaml
-    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/post.yaml
-    timeout: 5400
+    run: playbooks/legacy/ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3/run.yaml
+    post-run: playbooks/legacy/ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3/post.yaml
+    timeout: 7200

zuul.d/project.yaml

@@ -1,14 +1,14 @@
 - project:
     check:
       jobs:
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
+        - ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src
+        - ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src
+        - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src
+        - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src
+        - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src
+        - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src
         # Non-voting jobs
         - ipa-tempest-dsvm-ironic-inspector-src:
             voting: false
@@ -18,19 +18,19 @@
     gate:
       queue: ironic
       jobs:
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src
-        - ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src
-        - ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src
-        - ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src
+        - ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src
+        - ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src
+        - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src
+        - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src
+        - ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src
+        - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src
+        - ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src
         - openstack-tox-lower-constraints
     experimental:
       jobs:
-        - ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src
-        - ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3
+        - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa256-src
+        - ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3
     post:
       jobs:
         - ironic-python-agent-buildimage-coreos