diff --git a/doc/source/contributor/jobs-description.rst b/doc/source/contributor/jobs-description.rst index 86dd3841e9..12926bca9a 100644 --- a/doc/source/contributor/jobs-description.rst +++ b/doc/source/contributor/jobs-description.rst @@ -47,11 +47,6 @@ The description of each jobs that runs in the CI when you submit a patch for `pxe` boot and `snmp` driver. Runs tempest tests that match the regex `ironic_tempest_plugin.tests.scenario` and deploys 1 virtual baremetal. - * - ironic-tempest-partition-bios-ipmi-pxe - - Deploys Ironic in DevStack, configured to use dib ramdisk, a partition - image, `pxe` boot in legacy mode and `ipmi` hardware type. - Runs tempest tests that match the regex - `ironic_tempest_plugin.tests.scenario` and deploy 1 virtual baremetal. * - ironic-tempest-partition-uefi-ipmi-pxe - Deploys Ironic in DevStack, configured to use dib ramdisk, a partition image, `pxe` boot in UEFI mode and `ipmi` hardware type. diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 542ace43c2..bebf29682f 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -215,7 +215,7 @@ s-proxy: False - job: - name: ironic-tempest-bios-redfish-netboot + name: ironic-tempest-bios-redfish-pxe description: "Deploy ironic node over PXE using BIOS boot mode" parent: ironic-tempest-uefi-redfish-vmedia required-projects: @@ -223,12 +223,13 @@ vars: devstack_localrc: IRONIC_ENABLED_BOOT_INTERFACES: ipxe + IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True + IRONIC_VM_EPHEMERAL_DISK: 0 SWIFT_ENABLE_TEMPURLS: False SWIFT_TEMPURL_KEY: '' # Parent job has a longer timeout due to vmedia usage, # Reset the callback to a normal-ish value. IRONIC_CALLBACK_TIMEOUT: 600 - IRONIC_DEFAULT_BOOT_OPTION: netboot IRONIC_BOOT_MODE: bios devstack_services: # Parent job uses swift, this one does not, thus we can turn it off. @@ -237,6 +238,17 @@ s-object: False s-proxy: False +# TODO(dtantsur): remove when sushy-tools no longer uses it. +- job: + name: ironic-tempest-bios-redfish-netboot + description: "Deploy ironic node over PXE using BIOS boot mode" + parent: ironic-tempest-bios-redfish-pxe + vars: + devstack_localrc: + IRONIC_DEFAULT_BOOT_OPTION: netboot + IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False + IRONIC_VM_EPHEMERAL_DISK: 1 + - job: name: ironic-tempest-uefi-redfish-vmedia description: "Deploy ironic node over Redfish virtual media using UEFI boot mode" @@ -262,8 +274,8 @@ s-proxy: True - job: - name: ironic-inspector-tempest-partition-bios-redfish-vmedia - description: "Inspect and deploy ironic node over Redfish virtual media using legacy BIOS boot mode" + name: ironic-inspector-tempest-uefi-redfish-vmedia + description: "Inspect and deploy ironic node over Redfish virtual media using UEFI" parent: ironic-tempest-partition-uefi-redfish-vmedia required-projects: - opendev.org/openstack/ironic-inspector @@ -272,8 +284,6 @@ # Excluding the abort tests since it hits "node locked" too often. tempest_test_regex: test_baremetal_introspection devstack_localrc: - IRONIC_BOOT_MODE: bios - IRONIC_DEFAULT_BOOT_OPTION: netboot IRONIC_INSPECTOR_MANAGED_BOOT: True IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK: '' IRONIC_AUTOMATED_CLEAN_ENABLED: False @@ -293,7 +303,6 @@ IRONIC_ENABLED_BOOT_INTERFACES: "fake,pxe" IRONIC_IPXE_ENABLED: False IRONIC_AUTOMATED_CLEAN_ENABLED: False - IRONIC_DEFAULT_BOOT_OPTION: netboot devstack_services: mysql: False postgresql: True @@ -336,23 +345,12 @@ - job: name: ironic-tempest-partition-uefi-ipmi-pxe - description: IPMI power, UEFI, netboot, partition image. + description: IPMI power, UEFI, partition image. parent: ironic-base vars: devstack_localrc: IRONIC_AUTOMATED_CLEAN_ENABLED: False -- job: - name: ironic-tempest-partition-bios-ipmi-pxe - description: IPMI power, legacy BIOS, netboot, partition image and cleaning. - parent: ironic-base - vars: - devstack_localrc: - IRONIC_BOOT_MODE: bios - IRONIC_DEFAULT_BOOT_OPTION: netboot - IRONIC_AUTOMATED_CLEAN_ENABLED: True - - - job: name: ironic-tempest-bfv description: ironic-tempest-bfv @@ -410,7 +408,6 @@ IRONIC_AUTOMATED_CLEAN_ENABLED: False SWIFT_ENABLE_TEMPURLS: True SWIFT_TEMPURL_KEY: secretkey - IRONIC_DEFAULT_BOOT_OPTION: netboot devstack_plugins: ironic-inspector: https://opendev.org/openstack/ironic-inspector devstack_services: @@ -855,11 +852,10 @@ IRONIC_DEPLOY_DRIVER: ipmi IRONIC_INSPECTOR_BUILD_RAMDISK: False IRONIC_RAMDISK_TYPE: tinyipa - IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False + IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True IRONIC_VM_COUNT: 4 - IRONIC_VM_EPHEMERAL_DISK: 1 + IRONIC_VM_EPHEMERAL_DISK: 0 IRONIC_VM_SPECS_RAM: 1024 - IRONIC_DEFAULT_BOOT_OPTION: netboot IRONIC_AUTOMATED_CLEAN_ENABLED: False Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan @@ -934,7 +930,6 @@ IRONIC_BUILD_DEPLOY_RAMDISK: False IRONIC_CALLBACK_TIMEOUT: 700 IRONIC_DEFAULT_DEPLOY_INTERFACE: direct - IRONIC_DEFAULT_BOOT_OPTION: netboot IRONIC_DEPLOY_DRIVER: ipmi IRONIC_VM_COUNT: 4 IRONIC_VM_EPHEMERAL_DISK: 1 @@ -1018,7 +1013,6 @@ IRONIC_CALLBACK_TIMEOUT: 700 IRONIC_TEMPEST_BUILD_TIMEOUT: 1200 IRONIC_DEFAULT_DEPLOY_INTERFACE: direct - IRONIC_DEFAULT_BOOT_OPTION: netboot IRONIC_DEPLOY_DRIVER: ipmi IRONIC_ENABLED_NETWORK_INTERFACES: flat,neutron IRONIC_NETWORK_INTERFACE: neutron diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index f1e3d7b162..8b821f8166 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -17,10 +17,9 @@ - ironic-grenade - ironic-standalone - ironic-standalone-redfish - - ironic-tempest-bios-redfish-netboot + - ironic-tempest-bios-redfish-pxe - ironic-tempest-uefi-redfish-vmedia - ironic-tempest-wholedisk-bios-snmp-pxe - - ironic-tempest-partition-bios-ipmi-pxe - ironic-tempest-partition-uefi-ipmi-pxe # NOTE(TheJulia) Marking multinode non-voting on 20210311 # Due to a high failure rate on limestone where the compute1 @@ -40,7 +39,7 @@ voting: false - ironic-inspector-tempest-managed-non-standalone: voting: false - - ironic-inspector-tempest-partition-bios-redfish-vmedia: + - ironic-inspector-tempest-uefi-redfish-vmedia: voting: false - ironic-tempest-ipa-wholedisk-bios-ipmi-direct-dib: voting: false @@ -64,10 +63,9 @@ - ironic-grenade - ironic-standalone - ironic-standalone-redfish - - ironic-tempest-bios-redfish-netboot + - ironic-tempest-bios-redfish-pxe - ironic-tempest-uefi-redfish-vmedia - ironic-tempest-wholedisk-bios-snmp-pxe - - ironic-tempest-partition-bios-ipmi-pxe - ironic-tempest-partition-uefi-ipmi-pxe # NOTE(TheJulia): Disabled multinode on 20210311 due to Limestone # seeming to be