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. Changed l-c job to run on ubuntu bionic to avoid failures Change-Id: Ic9f3ddc9cd48c5a973996a4136d9832f869c0b08
This commit is contained in:
parent
03c772c77a
commit
8618bba7f6
|
@ -150,7 +150,7 @@
|
||||||
export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0
|
export DEVSTACK_GATE_IRONIC_BUILD_RAMDISK=0
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_INSPECTOR_BUILD_RAMDISK=False"
|
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"
|
||||||
|
|
||||||
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_REQUIRE_AGENT_TOKEN=False"
|
export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_REQUIRE_AGENT_TOKEN=False"
|
||||||
|
|
||||||
|
|
|
@ -122,7 +122,7 @@
|
||||||
IRONIC_RAMDISK_TYPE: tinyipa
|
IRONIC_RAMDISK_TYPE: tinyipa
|
||||||
IRONIC_RPC_TRANSPORT: json-rpc
|
IRONIC_RPC_TRANSPORT: json-rpc
|
||||||
IRONIC_VM_SPECS_RAM: 384
|
IRONIC_VM_SPECS_RAM: 384
|
||||||
IRONIC_VM_COUNT: 6
|
IRONIC_VM_COUNT: 4
|
||||||
IRONIC_VM_VOLUME_COUNT: 2
|
IRONIC_VM_VOLUME_COUNT: 2
|
||||||
# We're using a lot of disk space in this job. Some testing nodes have
|
# 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
|
# a small root partition, so use /opt which is mounted from a bigger
|
||||||
|
@ -180,7 +180,7 @@
|
||||||
IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct,ansible"
|
IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct,ansible"
|
||||||
IRONIC_RPC_TRANSPORT: json-rpc
|
IRONIC_RPC_TRANSPORT: json-rpc
|
||||||
IRONIC_RAMDISK_TYPE: tinyipa
|
IRONIC_RAMDISK_TYPE: tinyipa
|
||||||
IRONIC_VM_COUNT: 6
|
IRONIC_VM_COUNT: 4
|
||||||
IRONIC_VM_VOLUME_COUNT: 2
|
IRONIC_VM_VOLUME_COUNT: 2
|
||||||
IRONIC_VM_SPECS_RAM: 384
|
IRONIC_VM_SPECS_RAM: 384
|
||||||
# We're using a lot of disk space in this job. Some testing nodes have
|
# We're using a lot of disk space in this job. Some testing nodes have
|
||||||
|
@ -257,6 +257,7 @@
|
||||||
IRONIC_INSPECTOR_MANAGED_BOOT: True
|
IRONIC_INSPECTOR_MANAGED_BOOT: True
|
||||||
IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK: ''
|
IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK: ''
|
||||||
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
IRONIC_AUTOMATED_CLEAN_ENABLED: False
|
||||||
|
IRONIC_VM_COUNT: 1
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
ironic-inspector: https://opendev.org/openstack/ironic-inspector
|
ironic-inspector: https://opendev.org/openstack/ironic-inspector
|
||||||
devstack_services:
|
devstack_services:
|
||||||
|
@ -378,6 +379,7 @@
|
||||||
SWIFT_ENABLE_TEMPURLS: True
|
SWIFT_ENABLE_TEMPURLS: True
|
||||||
SWIFT_TEMPURL_KEY: secretkey
|
SWIFT_TEMPURL_KEY: secretkey
|
||||||
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
||||||
|
IRONIC_VM_COUNT: 1
|
||||||
devstack_plugins:
|
devstack_plugins:
|
||||||
ironic-inspector: https://opendev.org/openstack/ironic-inspector
|
ironic-inspector: https://opendev.org/openstack/ironic-inspector
|
||||||
devstack_services:
|
devstack_services:
|
||||||
|
@ -823,7 +825,7 @@
|
||||||
IRONIC_INSPECTOR_BUILD_RAMDISK: False
|
IRONIC_INSPECTOR_BUILD_RAMDISK: False
|
||||||
IRONIC_RAMDISK_TYPE: tinyipa
|
IRONIC_RAMDISK_TYPE: tinyipa
|
||||||
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
|
IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False
|
||||||
IRONIC_VM_COUNT: 6
|
IRONIC_VM_COUNT: 4
|
||||||
IRONIC_VM_EPHEMERAL_DISK: 1
|
IRONIC_VM_EPHEMERAL_DISK: 1
|
||||||
IRONIC_VM_SPECS_RAM: 384
|
IRONIC_VM_SPECS_RAM: 384
|
||||||
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
IRONIC_DEFAULT_BOOT_OPTION: netboot
|
||||||
|
|
|
@ -9,6 +9,8 @@
|
||||||
- release-notes-jobs-python3
|
- release-notes-jobs-python3
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
|
- openstack-tox-lower-constraints:
|
||||||
|
nodeset: ubuntu-bionic
|
||||||
- ironic-tox-unit-with-driver-libs
|
- ironic-tox-unit-with-driver-libs
|
||||||
- ironic-standalone
|
- ironic-standalone
|
||||||
- ironic-standalone-redfish:
|
- ironic-standalone-redfish:
|
||||||
|
@ -50,6 +52,8 @@
|
||||||
gate:
|
gate:
|
||||||
queue: ironic
|
queue: ironic
|
||||||
jobs:
|
jobs:
|
||||||
|
- openstack-tox-lower-constraints:
|
||||||
|
nodeset: ubuntu-bionic
|
||||||
- ironic-tox-unit-with-driver-libs
|
- ironic-tox-unit-with-driver-libs
|
||||||
- ironic-standalone
|
- ironic-standalone
|
||||||
- ironic-tempest-functional-python3
|
- ironic-tempest-functional-python3
|
||||||
|
|
Loading…
Reference in New Issue