Browse Source

CI: Patch to fix CI jobs in bugfix/stable branches

Composite of effective changes from:
I36f8fc8130ed914e8a2c2a11c9679144d931ad73
Ia6dac22081c92bbccc803f233dd53740f6b48abb
I820bba1347954b659fd7469ed542f98ef0a6eaf0

Ultimately to reduce CI VM count in terms of memory
utilization and disk utilization in order to get
consumption into a safe range to prevent
out of memory and out of disk space conditions.

Also disables automated erasure on one of the jobs
where it was disabled on other branches as it is
already tested elsewhere in the gate.

Change-Id: Ic9f3ddc9cd48c5a973996a4136d9832f869c0b08
changes/07/753707/1 stein-em
Julia Kreger 8 months ago
parent
commit
8964d9981e
3 changed files with 9 additions and 5 deletions
  1. +1
    -1
      playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml
  2. +1
    -1
      playbooks/legacy/grenade-dsvm-ironic/run.yaml
  3. +7
    -3
      zuul.d/ironic-jobs.yaml

+ 1
- 1
playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml 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


+ 1
- 1
playbooks/legacy/grenade-dsvm-ironic/run.yaml 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


+ 7
- 3
zuul.d/ironic-jobs.yaml View File

@ -91,7 +91,8 @@
IRONIC_DEFAULT_DEPLOY_INTERFACE: direct
IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct,ansible"
IRONIC_RPC_TRANSPORT: json-rpc
IRONIC_VM_COUNT: 6
IRONIC_VM_COUNT: 4
LIBVIRT_STORAGE_POOL_PATH: /opt/libvirt/images
SWIFT_ENABLE_TEMPURLS: True
SWIFT_TEMPURL_KEY: secretkey
devstack_services:
@ -119,6 +120,8 @@
devstack_localrc:
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
@ -224,6 +227,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:
@ -357,7 +361,7 @@
IRONIC_TEMPEST_BUILD_TIMEOUT: 600
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: True
IRONIC_USE_LINK_LOCAL: True
IRONIC_VM_COUNT: 7
IRONIC_VM_COUNT: 4
IRONIC_VM_EPHEMERAL_DISK: 0
IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs'
IRONIC_VM_SPECS_RAM: 384
@ -428,7 +432,7 @@
IRONIC_PROVISION_NETWORK_NAME: ironic-provision
IRONIC_RAMDISK_TYPE: tinyipa
IRONIC_USE_LINK_LOCAL: True
IRONIC_VM_COUNT: 7
IRONIC_VM_COUNT: 4
IRONIC_VM_EPHEMERAL_DISK: 0
IRONIC_VM_LOG_DIR: '{{ devstack_base_dir }}/ironic-bm-logs'
IRONIC_VM_NETWORK_BRIDGE: sub1brbm


Loading…
Cancel
Save