Merge "CI: Patch to fix CI jobs in bugfix/stable branches" into stable/train

This commit is contained in:
Zuul 2020-09-23 21:37:26 +00:00 committed by Gerrit Code Review
commit ac01a9b14f
3 changed files with 5 additions and 3 deletions

View File

@ -146,7 +146,7 @@
export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=7"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=4"
# Ensure the ironic-vars-EARLY file exists
touch ironic-vars-early

View File

@ -93,7 +93,7 @@
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_AUTOMATED_CLEAN_ENABLED=False"
export DEVSTACK_GATE_TEMPEST_REGEX=test_server_basic_ops
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=7"
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_COUNT=4"
# Ensure the ironic-vars-EARLY file exists
touch ironic-vars-early

View File

@ -107,7 +107,7 @@
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_COUNT: 4
IRONIC_VM_VOLUME_COUNT: 2
# We're using a lot of disk space in this job. Some testing nodes have
# a small root partition, so use /opt which is mounted from a bigger
@ -141,6 +141,7 @@
IRONIC_DEPLOY_DRIVER: redfish
IRONIC_ENABLED_HARDWARE_TYPES: redfish
IRONIC_VM_COUNT: 2
IRONIC_AUTOMATED_CLEAN_ENABLED: False
- job:
name: ironic-tempest-pxe_ipmitool-postgres
@ -251,6 +252,7 @@
IRONIC_AUTOMATED_CLEAN_ENABLED: False
SWIFT_ENABLE_TEMPURLS: True
SWIFT_TEMPURL_KEY: secretkey
IRONIC_VM_COUNT: 1
devstack_plugins:
ironic-inspector: https://opendev.org/openstack/ironic-inspector
devstack_services: