diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml index 810f46a3c..014860396 100644 --- a/zuul.d/ironic-python-agent-jobs.yaml +++ b/zuul.d/ironic-python-agent-jobs.yaml @@ -25,23 +25,7 @@ devstack_services: dstat: false -# used by diskimage-builder -- job: - name: ipa-tempest-wholedisk-bios-ipmi-direct-dib-src - parent: ironic-ipa-base - vars: - devstack_services: - s-account: True - s-container: True - s-object: True - s-proxy: True - devstack_localrc: - IRONIC_DEFAULT_DEPLOY_INTERFACE: direct - IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True - IRONIC_VM_EPHEMERAL_DISK: 0 - SWIFT_ENABLE_TEMPURLS: True - SWIFT_TEMPURL_KEY: secretkey - +# used by diskimage-builder and IPA-builder - job: name: ipa-tempest-bios-ipmi-direct-src parent: ironic-ipa-base @@ -84,14 +68,6 @@ SWIFT_ENABLE_TEMPURLS: True SWIFT_TEMPURL_KEY: secretkey -# used by diskimage-builder -- job: - name: ipa-tempest-bios-ipmi-iscsi-src - parent: ironic-ipa-base - vars: - devstack_localrc: - IRONIC_DEFAULT_BOOT_OPTION: netboot - # used by ironic-python-agent-builder - job: name: ipa-tempest-ironic-inspector-src @@ -157,7 +133,7 @@ IRONIC_BUILD_DEPLOY_RAMDISK: True # NOTE(dtantsur): the ansible deploy doesn't depend on IPA code, # excluding it from the enabled list to save gate time. - IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct" + IRONIC_ENABLED_DEPLOY_INTERFACES: "direct" - job: name: metalsmith-integration-ipa-src @@ -194,12 +170,3 @@ devstack_localrc: IRONIC_RAMDISK_TYPE: tinyipa IRONIC_VM_SPECS_RAM: 1024 - -# used by ironic-python-agent-builder -- job: - name: ipa-tempest-bios-ipmi-iscsi-tinyipa-src - parent: ipa-tempest-bios-ipmi-iscsi-src - vars: - devstack_localrc: - IRONIC_RAMDISK_TYPE: tinyipa - IRONIC_VM_SPECS_RAM: 1024 diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index df0995868..ff5161d66 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -12,7 +12,6 @@ # NOTE(iurygregory) Only run this two jobs since we are testing # wholedisk + partition on tempest - ipa-tempest-bios-ipmi-direct-src - - ipa-tempest-bios-ipmi-iscsi-src - ipa-tempest-uefi-redfish-vmedia-src # NOTE(TheJulia): The cleaning tests run in standalone job has a # high failure rate due to possible race during long running steps @@ -40,7 +39,6 @@ jobs: - openstack-tox-functional - ipa-tempest-bios-ipmi-direct-src - - ipa-tempest-bios-ipmi-iscsi-src - ipa-tempest-uefi-redfish-vmedia-src - metalsmith-integration-ipa-src post: