Merge "Replace the netboot job with a local-boot one"

zuul.d/ironic-lib-jobs.yaml

@@ -23,7 +23,7 @@
         SWIFT_TEMPURL_KEY: secretkey
 
 - job:
-    name: ironic-lib-local-uefi-ipmi-src
+    name: ironic-lib-uefi-ipmi-src
     parent: ironic-lib-base
     timeout: 7200
     vars:
@@ -37,7 +37,7 @@
         IRONIC_VM_EPHEMERAL_DISK: 0
 
 - job:
-    name: ironic-lib-netboot-bios-ipmi-src
+    name: ironic-lib-bios-ipmi-src
     parent: ironic-lib-base
     timeout: 7200
     vars:
@@ -48,4 +48,3 @@
         s-proxy: True
       devstack_localrc:
         IRONIC_BOOT_MODE: bios
-        IRONIC_DEFAULT_BOOT_OPTION: netboot

zuul.d/project.yaml

@@ -7,12 +7,12 @@
       - publish-openstack-docs-pti
     check:
       jobs:
-        - ironic-lib-local-uefi-ipmi-src
-        - ironic-lib-netboot-bios-ipmi-src
+        - ironic-lib-uefi-ipmi-src
+        - ironic-lib-bios-ipmi-src
     gate:
       jobs:
-        - ironic-lib-local-uefi-ipmi-src
-        - ironic-lib-netboot-bios-ipmi-src
+        - ironic-lib-uefi-ipmi-src
+        - ironic-lib-bios-ipmi-src
     post:
       jobs:
         - ironic-python-agent-build-image-tinyipa