From cfc0f5dac9b4db63f47a59e67906e7be4dff3b5a Mon Sep 17 00:00:00 2001 From: Dmitry Tantsur Date: Fri, 6 Sep 2019 12:16:34 +0200 Subject: [PATCH] Combined gate fixes We seem to be running out of disk space in standalone and mutlinode jobs. Since we're creating a lot of virtual disks here, reduce each to 4 GiB. No jobs need so much anyway. Reducing further will likely hit issues with IPA assumptions of root devices. Then correct setting OS_TEST_TIMEOUT in the multinode job. DevStack variables do not affect tox runs, we need to use a new tempest role variable instead. Change-Id: Iceebf246b000cf77cbbf62e4edb9b06ee9dd7b71 --- zuul.d/ironic-jobs.yaml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 0b3d2055a5..be10039622 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -46,6 +46,9 @@ IRONIC_VM_EPHEMERAL_DISK: 1 IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs' IRONIC_VM_SPECS_RAM: 384 + # NOTE(dtantsur): in some jobs we end up with 12 disks total, so reduce + # 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 @@ -350,6 +353,7 @@ tox_envlist: all tempest_concurrency: 4 tempest_test_regex: "(ironic_tempest_plugin.tests.scenario|test_schedule_to_all_nodes)" + tempest_test_timeout: 2400 devstack_localrc: BUILD_TIMEOUT: 1200 DEFAULT_INSTANCE_TYPE: baremetal @@ -382,7 +386,7 @@ IRONIC_VM_EPHEMERAL_DISK: 0 IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs' IRONIC_VM_SPECS_RAM: 384 - OS_TEST_TIMEOUT: 2400 + IRONIC_VM_SPECS_DISK: 4 OVERRIDE_PUBLIC_BRIDGE_MTU: 1400 OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br-infra' OVS_PHYSICAL_BRIDGE: brbm