From f67bbeb9f6e45ff1d3b041fb622bb64e839e33ed Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Thu, 3 Feb 2022 18:55:59 +0100 Subject: [PATCH] Clean up jobs with legacy names Not everyone on the team even knows what pxe_ipmitool used to mean :) Furthermore, we don't need "ipa" in job names, everything uses IPA for... even longer than pxe_ipmitool does not exist. While here, one job was clearly meant to use BIOS boot, but it does not. Change-Id: I8a37efa0f222361f30ddb7fa621548685a40f961 --- doc/source/contributor/jobs-description.rst | 12 ++++++------ zuul.d/ironic-jobs.yaml | 10 +++++----- zuul.d/project.yaml | 8 ++++---- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/doc/source/contributor/jobs-description.rst b/doc/source/contributor/jobs-description.rst index ebcef767e6..00fe074caf 100644 --- a/doc/source/contributor/jobs-description.rst +++ b/doc/source/contributor/jobs-description.rst @@ -47,14 +47,14 @@ 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-ipa-partition-pxe_ipmitool - - Deploys Ironic in DevStack under Python3, configured to use dib - ramdisk partition image with `pxe` boot and `ipmi` driver. + * - 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-ipa-partition-uefi-pxe_ipmitool - - Deploys Ironic in DevStack, configured to use dib ramdisk partition - image with `uefi` boot and `ipmi` driver. + * - 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. Runs tempest tests that match the regex `ironic_tempest_plugin.tests.scenario`, also deploys 1 virtual baremetal. diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index cbf45a2f22..a5a8f9b50f 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -337,21 +337,21 @@ IRONIC_BOOT_MODE: bios - job: - name: ironic-tempest-ipa-partition-uefi-pxe_ipmitool - description: ironic-tempest-ipa-partition-uefi-pxe_ipmitool + name: ironic-tempest-partition-uefi-ipmi-pxe + description: IPMI power, UEFI, netboot, partition image. parent: ironic-base vars: devstack_localrc: - IRONIC_VM_SPECS_RAM: 4096 IRONIC_AUTOMATED_CLEAN_ENABLED: False IRONIC_DEFAULT_BOOT_OPTION: netboot - job: - name: ironic-tempest-ipa-partition-pxe_ipmitool - description: ironic-tempest-ipa-partition-pxe_ipmitool that also tests cleaning. + 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 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 869144ba3b..5e054a26b9 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -21,8 +21,8 @@ - ironic-tempest-partition-bios-redfish-pxe - ironic-tempest-partition-uefi-redfish-vmedia - ironic-tempest-wholedisk-bios-snmp-pxe - - ironic-tempest-ipa-partition-pxe_ipmitool - - ironic-tempest-ipa-partition-uefi-pxe_ipmitool + - 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 # machine never appears to be able to communicate across the @@ -67,8 +67,8 @@ - ironic-tempest-partition-bios-redfish-pxe - ironic-tempest-partition-uefi-redfish-vmedia - ironic-tempest-wholedisk-bios-snmp-pxe - - ironic-tempest-ipa-partition-pxe_ipmitool - - ironic-tempest-ipa-partition-uefi-pxe_ipmitool + - ironic-tempest-partition-bios-ipmi-pxe + - ironic-tempest-partition-uefi-ipmi-pxe # NOTE(TheJulia): Disabled multinode on 20210311 due to Limestone # seeming to be # - ironic-tempest-ipa-wholedisk-direct-tinyipa-multinode