diff --git a/zuul.d/ironic-python-agent-jobs.yaml b/zuul.d/ironic-python-agent-jobs.yaml index 45c7ba2da..bd69a91a1 100644 --- a/zuul.d/ironic-python-agent-jobs.yaml +++ b/zuul.d/ironic-python-agent-jobs.yaml @@ -15,7 +15,6 @@ vars: devstack_localrc: IRONIC_BUILD_DEPLOY_RAMDISK: True - USE_PYTHON3: True - job: name: ipa-tempest-wholedisk-bios-ipmi-direct-tinyipa-src @@ -30,7 +29,6 @@ devstack_localrc: IRONIC_DEFAULT_DEPLOY_INTERFACE: direct IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True - USE_PYTHON3: False IRONIC_VM_EPHEMERAL_DISK: 0 SWIFT_ENABLE_TEMPURLS: True SWIFT_TEMPURL_KEY: secretkey @@ -47,7 +45,6 @@ s-proxy: True devstack_localrc: IRONIC_DEFAULT_DEPLOY_INTERFACE: direct - USE_PYTHON3: False SWIFT_ENABLE_TEMPURLS: True SWIFT_TEMPURL_KEY: secretkey @@ -89,14 +86,13 @@ # Experimental jobs - job: - name: ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3 + name: ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa parent: ironic-ipa-base timeout: 7200 required-projects: - openstack/python-ironicclient vars: devstack_localrc: - USE_PYTHON3: True EBTABLES_RACE_FIX: True IRONIC_INSPECTOR_BUILD_RAMDISK: True USE_SUBNETPOOL: False diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index fbab679d6..b735fa6a6 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -43,7 +43,7 @@ experimental: jobs: - ipa-tempest-dsvm-partition-bios-ipmi-iscsi-tinyipa256-src - - ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa-python3 + - ipa-tempest-dsvm-partition-ipmi-iscsi-tinyipa post: jobs: - ironic-python-agent-build-image-tinyipa