Merge "Stop running test_schedule_to_all_nodes in the multinode job" into stable/ussuri

This commit is contained in:
Zuul 2020-07-23 18:36:49 +00:00 committed by Gerrit Code Review
commit 778d654070
1 changed files with 6 additions and 5 deletions

View File

@ -414,7 +414,7 @@
vars: vars:
tox_envlist: all tox_envlist: all
tempest_concurrency: 3 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 tempest_test_timeout: 2400
devstack_localrc: devstack_localrc:
BUILD_TIMEOUT: 2400 BUILD_TIMEOUT: 2400
@ -444,10 +444,10 @@
IRONIC_TEMPEST_BUILD_TIMEOUT: 600 IRONIC_TEMPEST_BUILD_TIMEOUT: 600
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
IRONIC_USE_LINK_LOCAL: True IRONIC_USE_LINK_LOCAL: True
IRONIC_VM_COUNT: 6 IRONIC_VM_COUNT: 3
IRONIC_VM_EPHEMERAL_DISK: 0 IRONIC_VM_EPHEMERAL_DISK: 0
IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs' 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_DISK: 4
OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br-infra' OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br-infra'
OVS_PHYSICAL_BRIDGE: brbm OVS_PHYSICAL_BRIDGE: brbm
@ -521,11 +521,12 @@
IRONIC_PROVISION_NETWORK_NAME: ironic-provision IRONIC_PROVISION_NETWORK_NAME: ironic-provision
IRONIC_RAMDISK_TYPE: tinyipa IRONIC_RAMDISK_TYPE: tinyipa
IRONIC_USE_LINK_LOCAL: True IRONIC_USE_LINK_LOCAL: True
IRONIC_VM_COUNT: 6 IRONIC_VM_COUNT: 3
IRONIC_VM_EPHEMERAL_DISK: 0 IRONIC_VM_EPHEMERAL_DISK: 0
IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs' IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs'
IRONIC_VM_NETWORK_BRIDGE: sub1brbm IRONIC_VM_NETWORK_BRIDGE: sub1brbm
IRONIC_VM_SPECS_RAM: 384 IRONIC_VM_SPECS_RAM: 512
IRONIC_VM_SPECS_DISK: 4
OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br-infra' OVS_BRIDGE_MAPPINGS: 'mynetwork:sub1brbm,public:br-infra'
OVS_PHYSICAL_BRIDGE: sub1brbm OVS_PHYSICAL_BRIDGE: sub1brbm
PHYSICAL_NETWORK: mynetwork PHYSICAL_NETWORK: mynetwork