diff options
| author | Julia Kreger <juliaashleykreger@gmail.com> | 2020-09-22 16:17:45 -0700 |
|---|---|---|
| committer | Iury Gregory Melo Ferreira <imelofer@redhat.com> | 2020-09-23 09:44:14 +0200 |
| commit | 8618bba7f65bb735eb202c3f7af8de90a62e4dad (patch) | |
| tree | 85c1963abd0435a3b6ea58de5a25ebdf2d479ba5 | |
| parent | 03c772c77a5a24968ae7e8ffd15a46248968fb51 (diff) | |
| download | ironic-bugfix/15.1.tar.gz | |
CI: Patch to fix CI jobs in bugfix/stable branchesbugfix-15.1-eolbugfix/15.1
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
| -rw-r--r-- | playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml | 2 | ||||
| -rw-r--r-- | zuul.d/ironic-jobs.yaml | 8 | ||||
| -rw-r--r-- | zuul.d/project.yaml | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml index a29fa530e..c47c72d7d 100644 --- a/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml +++ b/playbooks/legacy/grenade-dsvm-ironic-multinode-multitenant/run.yaml @@ -150,7 +150,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" export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_REQUIRE_AGENT_TOKEN=False" diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml index b980bdf48..970d674a1 100644 --- a/zuul.d/ironic-jobs.yaml +++ b/zuul.d/ironic-jobs.yaml @@ -122,7 +122,7 @@ IRONIC_RAMDISK_TYPE: tinyipa IRONIC_RPC_TRANSPORT: json-rpc IRONIC_VM_SPECS_RAM: 384 - 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 @@ -180,7 +180,7 @@ IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct,ansible" IRONIC_RPC_TRANSPORT: json-rpc IRONIC_RAMDISK_TYPE: tinyipa - IRONIC_VM_COUNT: 6 + IRONIC_VM_COUNT: 4 IRONIC_VM_VOLUME_COUNT: 2 IRONIC_VM_SPECS_RAM: 384 # 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_NODE_NOT_FOUND_HOOK: '' IRONIC_AUTOMATED_CLEAN_ENABLED: False + IRONIC_VM_COUNT: 1 devstack_plugins: ironic-inspector: https://opendev.org/openstack/ironic-inspector devstack_services: @@ -378,6 +379,7 @@ SWIFT_ENABLE_TEMPURLS: True SWIFT_TEMPURL_KEY: secretkey IRONIC_DEFAULT_BOOT_OPTION: netboot + IRONIC_VM_COUNT: 1 devstack_plugins: ironic-inspector: https://opendev.org/openstack/ironic-inspector devstack_services: @@ -823,7 +825,7 @@ IRONIC_INSPECTOR_BUILD_RAMDISK: False IRONIC_RAMDISK_TYPE: tinyipa IRONIC_TEMPEST_WHOLE_DISK_IMAGE: False - IRONIC_VM_COUNT: 6 + IRONIC_VM_COUNT: 4 IRONIC_VM_EPHEMERAL_DISK: 1 IRONIC_VM_SPECS_RAM: 384 IRONIC_DEFAULT_BOOT_OPTION: netboot diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index b08a37500..fea4e9b5a 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -9,6 +9,8 @@ - release-notes-jobs-python3 check: jobs: + - openstack-tox-lower-constraints: + nodeset: ubuntu-bionic - ironic-tox-unit-with-driver-libs - ironic-standalone - ironic-standalone-redfish: @@ -50,6 +52,8 @@ gate: queue: ironic jobs: + - openstack-tox-lower-constraints: + nodeset: ubuntu-bionic - ironic-tox-unit-with-driver-libs - ironic-standalone - ironic-tempest-functional-python3 |