Merge "Change BFV job to use ipxe interface"

zuul.d/ironic-jobs.yaml

@@ -216,6 +216,8 @@
       devstack_localrc:
         IRONIC_ENABLED_STORAGE_INTERFACES: cinder,noop
         IRONIC_STORAGE_INTERFACE: cinder
+        IRONIC_ENABLED_BOOT_INTERFACES: ipxe,pxe,fake
+        IRONIC_DEFAULT_BOOT_INTERFACE: ipxe
         IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
         IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
         IRONIC_VM_EPHEMERAL_DISK: 0
@@ -227,15 +229,6 @@
         c-vol: True
         cinder: True
 
-- job:
-    name: ironic-tempest-dsvm-ipxe-bfv
-    description: ironic-tempest-dsvm-ipxe-bfv
-    parent: ironic-tempest-dsvm-bfv
-    vars:
-      devstack_localrc:
-        IRONIC_ENABLED_BOOT_INTERFACES: ipxe,pxe,fake
-        IRONIC_DEFAULT_BOOT_INTERFACE: ipxe
-
 - job:
     name: ironic-tempest-dsvm-ironic-inspector
     description: ironic-tempest-dsvm-ironic-inspector

zuul.d/project.yaml

@@ -23,14 +23,8 @@
         - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa
         - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa-indirect
         - ironic-tempest-dsvm-ipa-partition-bios-agent_ipmitool-tinyipa-indirect
-        - ironic-tempest-dsvm-ipxe-bfv
+        - ironic-tempest-dsvm-bfv
         # Non-voting jobs
-        # NOTE(TheJulia): BFV default job moves to use the ipxe interface,
-        # this non-voting job is just a safety net as we continue to do
-        # refactoring/cleanup and can be removed later in the stein
-        # cycle or after.
-        - ironic-tempest-dsvm-bfv:
-            voting: false
         - ironic-tempest-dsvm-ipa-wholedisk-bios-pxe_snmp-tinyipa:
             voting: false
         - ironic-tempest-dsvm-ironic-inspector:
@@ -52,4 +46,4 @@
         - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa
         - ironic-tempest-dsvm-ipa-wholedisk-bios-agent_ipmitool-tinyipa-indirect
         - ironic-tempest-dsvm-ipa-partition-bios-agent_ipmitool-tinyipa-indirect
-        - ironic-tempest-dsvm-ipxe-bfv
+        - ironic-tempest-dsvm-bfv