From b4258bc6ce800e379af152788691031f3b1106b3 Mon Sep 17 00:00:00 2001 From: Iury Gregory Melo Ferreira Date: Fri, 8 Feb 2019 10:37:05 +0100 Subject: [PATCH] Refactor zuulv3 based on ironic-base Removing unnecessary variables and adding necessary ones. Depends-On: https://review.openstack.org/#/c/630100/ Change-Id: I881afea61e14ca3a14e3f6da04b58c8d7476857b --- zuul.d/ironic-lib-jobs.yaml | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/zuul.d/ironic-lib-jobs.yaml b/zuul.d/ironic-lib-jobs.yaml index 512da811..75d0fc3e 100644 --- a/zuul.d/ironic-lib-jobs.yaml +++ b/zuul.d/ironic-lib-jobs.yaml @@ -29,11 +29,12 @@ s-object: True s-proxy: True devstack_localrc: - IRONIC_DEPLOY_DRIVER: ipmi 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 - job: name: ironic-lib-partition-bios-ipmi-direct-tinyipa-src-python2 @@ -46,25 +47,22 @@ s-object: True s-proxy: True devstack_localrc: - IRONIC_DEPLOY_DRIVER: ipmi IRONIC_DEFAULT_DEPLOY_INTERFACE: direct USE_PYTHON3: False + SWIFT_ENABLE_TEMPURLS: True + SWIFT_TEMPURL_KEY: secretkey - job: name: ironic-lib-partition-bios-ipmi-iscsi-tinyipa-src parent: ironic-lib-base timeout: 7200 - vars: - IRONIC_DEPLOY_DRIVER: ipmi - IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi + - job: name: ironic-lib-partition-bios-ipmi-iscsi-tinyipa-src-python2 parent: ironic-lib-base timeout: 7200 vars: - IRONIC_DEPLOY_DRIVER: ipmi - IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi USE_PYTHON3: False - job: @@ -73,7 +71,5 @@ timeout: 7200 vars: devstack_localrc: - IRONIC_DEPLOY_DRIVER: ipmi - IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True IRONIC_VM_EPHEMERAL_DISK: 0