From a2472c15181e5544940000efc9a47fd449279a87 Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Tue, 22 Oct 2019 17:18:34 +0200 Subject: [PATCH] CI: limit rescue testing to only two jobs This feature is time-consuming and prone to race conditions. This changes switches it off by default, leaving it on in two jobs: the one running on Nova and the standalone one. Change-Id: I7c50cb12065da05dad4ece0918883748ee4617e0 --- devstack/lib/ironic | 2 +- zuul.d/ironic-jobs.yaml | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 350ed953a0..0d99f1cef8 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -181,7 +181,7 @@ IRONIC_ENABLED_MANAGEMENT_INTERFACES=${IRONIC_ENABLED_MANAGEMENT_INTERFACES:-"fa IRONIC_ENABLED_NETWORK_INTERFACES=${IRONIC_ENABLED_NETWORK_INTERFACES:-"flat,noop"} IRONIC_ENABLED_POWER_INTERFACES=${IRONIC_ENABLED_POWER_INTERFACES:-"fake,ipmitool"} IRONIC_ENABLED_RAID_INTERFACES=${IRONIC_ENABLED_RAID_INTERFACES:-"fake,agent,no-raid"} -IRONIC_ENABLED_RESCUE_INTERFACES=${IRONIC_ENABLED_RESCUE_INTERFACES:-"fake,agent,no-rescue"} +IRONIC_ENABLED_RESCUE_INTERFACES=${IRONIC_ENABLED_RESCUE_INTERFACES:-"fake,no-rescue"} IRONIC_ENABLED_STORAGE_INTERFACES=${IRONIC_ENABLED_STORAGE_INTERFACES:-"fake,cinder,noop"} IRONIC_ENABLED_VENDOR_INTERFACES=${IRONIC_ENABLED_VENDOR_INTERFACES:-"fake,ipmitool,no-vendor"} # for usage with hardware types diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index ae1887c9db..6eaf1f933c 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -49,7 +49,6 @@ # each of them. For don't need all 10 GiB for CirrOS anyway. IRONIC_VM_SPECS_DISK: 4 IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi - IRONIC_DEFAULT_RESCUE_INTERFACE: agent Q_AGENT: openvswitch Q_ML2_TENANT_NETWORK_TYPE: vxlan @@ -105,7 +104,9 @@ FORCE_CONFIG_DRIVE: False IRONIC_AUTOMATED_CLEAN_ENABLED: False IRONIC_DEFAULT_DEPLOY_INTERFACE: direct + IRONIC_DEFAULT_RESCUE_INTERFACE: agent IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct,ansible" + IRONIC_ENABLED_RESCUE_INTERFACES: "fake,agent,no-rescue" IRONIC_RPC_TRANSPORT: json-rpc IRONIC_VM_COUNT: 6 IRONIC_VM_VOLUME_COUNT: 2 @@ -160,6 +161,8 @@ vars: devstack_localrc: IRONIC_DEFAULT_DEPLOY_INTERFACE: direct + IRONIC_DEFAULT_RESCUE_INTERFACE: agent + IRONIC_ENABLED_RESCUE_INTERFACES: "fake,agent,no-rescue" IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True IRONIC_VM_EPHEMERAL_DISK: 0 SWIFT_ENABLE_TEMPURLS: True