diff options
| author | Zuul <zuul@review.opendev.org> | 2020-07-21 14:45:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2020-07-21 14:45:25 +0000 |
| commit | c2b8e3f80e46cb51c18a6e27cb959f9343307942 (patch) | |
| tree | f49c457b8b86d865512f0023317eeec0d055be47 /zuul.d | |
| parent | a1e2fc35b44f2c974999dde9e9c33b31c7365e9e (diff) | |
| parent | 1cb1df76d96810b0cb4204cb54503b83532ef7c9 (diff) | |
| download | ironic-c2b8e3f80e46cb51c18a6e27cb959f9343307942.tar.gz | |
Merge "Stop running test_schedule_to_all_nodes in the multinode job"
Diffstat (limited to 'zuul.d')
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index 17ea86dbf..5c66b9cec 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -470,7 +470,7 @@ vars: tox_envlist: all tempest_concurrency: 3 - tempest_test_regex: "(ironic_tempest_plugin.tests.scenario|test_schedule_to_all_nodes)" + tempest_test_regex: "ironic_tempest_plugin.tests.scenario" tempest_test_timeout: 2400 devstack_localrc: BUILD_TIMEOUT: 2400 @@ -500,10 +500,10 @@ IRONIC_TEMPEST_BUILD_TIMEOUT: 600 IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True IRONIC_USE_LINK_LOCAL: True - IRONIC_VM_COUNT: 6 + IRONIC_VM_COUNT: 3 IRONIC_VM_EPHEMERAL_DISK: 0 IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs' - IRONIC_VM_SPECS_RAM: 384 + IRONIC_VM_SPECS_RAM: 512 IRONIC_VM_SPECS_DISK: 4 IRONIC_VM_SPECS_CPU: 1 OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br-infra' @@ -583,11 +583,12 @@ IRONIC_PROVISION_NETWORK_NAME: ironic-provision IRONIC_RAMDISK_TYPE: tinyipa IRONIC_USE_LINK_LOCAL: True - IRONIC_VM_COUNT: 6 + IRONIC_VM_COUNT: 3 IRONIC_VM_EPHEMERAL_DISK: 0 IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs' IRONIC_VM_NETWORK_BRIDGE: sub1brbm - IRONIC_VM_SPECS_RAM: 384 + IRONIC_VM_SPECS_RAM: 512 + IRONIC_VM_SPECS_DISK: 4 IRONIC_VM_SPECS_CPU: 1 OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br-infra' OVS_PHYSICAL_BRIDGE: sub1brbm |