From 84b94ee2d1ab61a23e2a50c74437466e58c592a1 Mon Sep 17 00:00:00 2001 From: Julia Kreger Date: Wed, 31 Oct 2018 07:51:00 -0700 Subject: [PATCH] Change BFV job to use ipxe interface As Nova's CI jobs can call the ironic-tempest-dsvm-bfv job, it seemed to only make sense to keep that job name and have it leverage the ipxe boot interface instead. The newer named job, ironic-tempest-dsvm-ipxe-bfv only exists in the ironic repository according to codesearch.openstack.org. This removes one un-necessary check in the ironic check gate. Change-Id: I55bd2e7e5fa5d10ca6ed3093ebabf7dc3be07fb9 --- zuul.d/ironic-jobs.yaml | 11 ++--------- zuul.d/project.yaml | 10 ++-------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 2b9a3ff8f0..9c35dba22b 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/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 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index 0618040980..ff5ccbfbd7 100644 --- a/zuul.d/project.yaml +++ b/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