summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.opendev.org>2020-08-10 19:56:38 +0000
committerGerrit Code Review <review@openstack.org>2020-08-10 19:56:38 +0000
commitb26838b2913bbc739e88555c2441d1bc7fcd8429 (patch)
treed76b2684f0f80c51b9d8c7abd7a024e04d0558d4
parentab3f5c378d3f715abd6f72e987eecabbe167d7e7 (diff)
parentd1fe4b61a66def93f58456376b64c3be7b15a0f8 (diff)
downloadironic-b26838b2913bbc739e88555c2441d1bc7fcd8429.tar.gz
Merge "Change non-tinyipa jobs to use multiple cores" into stable/ussuri15.0.1
-rw-r--r--zuul.d/ironic-jobs.yaml3
1 files changed, 3 insertions, 0 deletions
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index 42af8081a..98b51f503 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -48,6 +48,7 @@
# 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_VM_SPECS_CPU: 2
IRONIC_DEFAULT_DEPLOY_INTERFACE: iscsi
Q_AGENT: openvswitch
@@ -113,6 +114,7 @@
IRONIC_RAMDISK_TYPE: tinyipa
IRONIC_RPC_TRANSPORT: json-rpc
IRONIC_VM_SPECS_RAM: 384
+ IRONIC_VM_SPECS_CPU: 1
IRONIC_VM_COUNT: 6
IRONIC_VM_VOLUME_COUNT: 2
# We're using a lot of disk space in this job. Some testing nodes have
@@ -448,6 +450,7 @@
IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs'
IRONIC_VM_SPECS_RAM: 512
IRONIC_VM_SPECS_DISK: 4
+ IRONIC_VM_SPECS_CPU: 1
OVS_BRIDGE_MAPPINGS: 'mynetwork:brbm,public:br-infra'
OVS_PHYSICAL_BRIDGE: brbm
PHYSICAL_NETWORK: mynetwork