Merge "Cleanup CI jobs for IPA"

22 files changed, 61 insertions, 61 deletions

diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-src/run.yaml
index 7e600bbc..18ac9746 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-coreos-src/run.yaml
+++ b/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"
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/run.yaml
index 8e18665b..8e18665b 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-agent_ipmitool-tinyipa-src/run.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-direct-tinyipa-src/run.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-coreos-src/run.yaml
index 2c7f3031..120f1c29 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-coreos-src/run.yaml
+++ b/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"
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/run.yaml
index 15776847..15776847 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa-src/run.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa-src/run.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa256-src/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa256-src/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa256-src/run.yaml
index deaab494..deaab494 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-bios-pxe_ipmitool-tinyipa256-src/run.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa256-src/run.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3/run.yaml
index 9407528d..9407528d 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-partition-pxe_ipmitool-tinyipa-python3/run.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3/run.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-coreos-src/run.yaml
index 7dff6ad2..9920e60d 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-coreos-src/run.yaml
+++ b/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"
diff --git a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/run.yaml
index f45ed298..f45ed298 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-agent_ipmitool-tinyipa-src/run.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-direct-tinyipa-src/run.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-coreos-src/run.yaml
index 38189948..94f6e992 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-coreos-src/run.yaml
+++ b/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"
diff --git a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/post.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/post.yaml
index e07f5510..e07f5510 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/post.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/post.yaml
diff --git a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/run.yaml b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/run.yaml
index b0bf8e23..b0bf8e23 100644
--- a/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-pxe_ipmitool-tinyipa-src/run.yaml
+++ b/playbooks/legacy/ipa-tempest-dsvm-wholedisk-bios-ipmi-iscsi-tinyipa-src/run.yaml
diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml
index dc9274b8..328ec5d2 100644
--- a/zuul.d/legacy-ironic-jobs.yaml
+++ b/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
-    timeout: 5400
+    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-agent_ipmitool-coreos-src
+    name: ipa-tempest-dsvm-partition-bios-ipmi-direct-coreos-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
+    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-wholedisk-bios-agent_ipmitool-tinyipa-src
+    name: ipa-tempest-dsvm-wholedisk-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-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-partition-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-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-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-pxe_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-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-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-wholedisk-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-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-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-partition-bios-pxe_ipmitool-coreos-src
+    name: ipa-tempest-dsvm-partition-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
+    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-wholedisk-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-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
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 72f9cbd8..d4c1a626 100644
--- a/zuul.d/project.yaml
+++ b/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