diff --git a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-redfish-tinyipa/run.yaml b/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-redfish-tinyipa/run.yaml
deleted file mode 100644
index 4a79612f98..0000000000
--- a/playbooks/legacy/tempest-dsvm-ironic-ipa-partition-redfish-tinyipa/run.yaml
+++ /dev/null
@@ -1,82 +0,0 @@
-- hosts: all
- name: Autoconverted job legacy-tempest-dsvm-ironic-ipa-partition-redfish-tinyipa
- from old job gate-tempest-dsvm-ironic-ipa-partition-redfish-tinyipa-ubuntu-xenial
- tasks:
-
- - shell:
- cmd: |
- cat << 'EOF' >> ironic-extra-vars
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_SPECS_RAM=384"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_RAMDISK_TYPE=tinyipa"
-
- export DEVSTACK_GATE_TEMPEST_REGEX="ironic_tempest_plugin.tests.scenario"
-
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- cat << 'EOF' >> ironic-vars-early
- # use tempest plugin
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"TEMPEST_PLUGINS+=' /opt/stack/new/ironic-tempest-plugin'"
- export TEMPEST_CONCURRENCY=1
- EOF
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
-
- - shell:
- cmd: |
- set -e
- set -x
- export PROJECTS="openstack/ironic $PROJECTS"
- export PROJECTS="openstack/ironic-lib $PROJECTS"
- export PROJECTS="openstack/ironic-python-agent $PROJECTS"
- export PROJECTS="openstack/ironic-tempest-plugin $PROJECTS"
- export PROJECTS="openstack/python-ironicclient $PROJECTS"
- export PROJECTS="openstack/pyghmi $PROJECTS"
- export PROJECTS="openstack/virtualbmc $PROJECTS"
- export PYTHONUNBUFFERED=true
- export DEVSTACK_GATE_TEMPEST=1
- export DEVSTACK_GATE_IRONIC=1
- export DEVSTACK_GATE_NEUTRON=1
- export DEVSTACK_GATE_VIRT_DRIVER=ironic
- export DEVSTACK_GATE_CONFIGDRIVE=1
- export DEVSTACK_GATE_IRONIC_DRIVER=redfish
- export BRANCH_OVERRIDE="{{ zuul.override_checkout | default('default') }}"
- if [ "$BRANCH_OVERRIDE" != "default" ] ; then
- export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
- fi
-
- if [[ "$ZUUL_BRANCH" != "stable/ocata" && "$BRANCH_OVERRIDE" != "stable/ocata" ]]; then
- export DEVSTACK_GATE_TLSPROXY=1
- fi
-
- # When deploying with redfish we need to enable the "redfish"
- # hardware type
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_HARDWARE_TYPES=redfish"
-
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=False"
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=1"
-
- export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False"
-
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=1"
-
- # Ensure the ironic-vars-EARLY file exists
- touch ironic-vars-early
- # Pull in the EARLY variables injected by the optional builders
- source ironic-vars-early
-
- export DEVSTACK_LOCAL_CONFIG+=$'\n'"enable_plugin ironic git://git.openstack.org/openstack/ironic"
-
- # Ensure the ironic-EXTRA-vars file exists
- touch ironic-extra-vars
- # Pull in the EXTRA variables injected by the optional builders
- source ironic-extra-vars
-
- cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
- ./safe-devstack-vm-gate-wrap.sh
- executable: /bin/bash
- chdir: '{{ ansible_user_dir }}/workspace'
- environment: '{{ zuul | zuul_legacy_vars }}'
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 2c73f17577..12d51648c8 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -124,3 +124,17 @@
s-container: True
s-object: True
s-proxy: True
+
+- job:
+ name: ironic-tempest-dsvm-ipa-partition-redfish-tinyipa
+ description: ironic-tempest-dsvm-ipa-partition-redfish-tinyipa
+ parent: ironic-base
+ timeout: 5400
+ irrelevant-files:
+ - ^driver-requirements.txt$
+ vars:
+ tempest_concurrency: 1
+ devstack_localrc:
+ IRONIC_DEPLOY_DRIVER: redfish
+ IRONIC_ENABLED_HARDWARE_TYPES: redfish
+ IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
diff --git a/zuul.d/legacy-ironic-jobs.yaml b/zuul.d/legacy-ironic-jobs.yaml
index 1a260b916f..47c0dfd624 100644
--- a/zuul.d/legacy-ironic-jobs.yaml
+++ b/zuul.d/legacy-ironic-jobs.yaml
@@ -92,12 +92,6 @@
timeout: 10800
nodeset: legacy-ubuntu-xenial-2-node
-- job:
- name: ironic-tempest-dsvm-ipa-partition-redfish-tinyipa
- parent: legacy-ironic-dsvm-base
- run: playbooks/legacy/tempest-dsvm-ironic-ipa-partition-redfish-tinyipa/run.yaml
- timeout: 5400
-
- job:
name: ironic-tempest-dsvm-bfv
parent: legacy-ironic-dsvm-base