From 397657f667c1d2d9773df53743781cfc011a537c Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Thu, 21 Sep 2023 11:18:38 +0900 Subject: [PATCH] Upgrade flavor for Fedora VM Since we bumped Fedora version used in CI from 36 to 37, we've seen timeout during boot process more frequently, which results in job failure. This increases core and ram assigned to Fedora VMs, to reduce failure rate. To avoid consuming too much resources, this limits concurrency of test runner. Change-Id: I12e8ee0861629fd42a6bd03ec8705751da12ff61 --- devstack/lib/heat | 2 +- devstack/upgrade/resources.sh | 2 +- roles/run-heat-tests/tasks/main.yaml | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/devstack/lib/heat b/devstack/lib/heat index 1865e4be3a..0f5816efc6 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -457,7 +457,7 @@ function configure_tempest_for_heat { fi iniset $TEMPEST_CONFIG heat_plugin skip_functional_test_list $SKIP_FUNCTIONAL_TEST_LIST - openstack flavor show m1.heat_int || openstack flavor create m1.heat_int --ram 512 --disk 10 + openstack flavor show m1.heat_int || openstack flavor create m1.heat_int --ram 1024 --vcpus 2 --disk 10 openstack flavor show m1.heat_micro || openstack flavor create m1.heat_micro --ram 128 --disk 1 export OS_CLOUD=devstack diff --git a/devstack/upgrade/resources.sh b/devstack/upgrade/resources.sh index b16b5deae2..9ad3c5fce5 100755 --- a/devstack/upgrade/resources.sh +++ b/devstack/upgrade/resources.sh @@ -95,7 +95,7 @@ function _run_heat_integrationtests { tox -evenv-tempest -- pip install -c$UPPER_CONSTRAINTS_FILE $HEAT_TEMPEST_PLUGIN tox -evenv-tempest -- stestr --test-path=$DEST/heat/heat_integrationtests --top-dir=$DEST/heat \ --group_regex='heat_tempest_plugin\.tests\.api\.test_heat_api[._]([^_]+)' \ - run --include-list $UPGRADE_TESTS + run --concurrency=4 --include-list $UPGRADE_TESTS _heat_set_user popd } diff --git a/roles/run-heat-tests/tasks/main.yaml b/roles/run-heat-tests/tasks/main.yaml index 03661d7742..1bcbe5c73f 100644 --- a/roles/run-heat-tests/tasks/main.yaml +++ b/roles/run-heat-tests/tasks/main.yaml @@ -29,7 +29,8 @@ - name: Run heat tests command: tox -evenv-tempest -- stestr --test-path={{devstack_base_dir}}/heat/heat_integrationtests \ --top-dir={{devstack_base_dir}}/heat \ - --group_regex='heat_tempest_plugin\.tests\.api\.test_heat_api[._]([^_]+)' run + --group_regex='heat_tempest_plugin\.tests\.api\.test_heat_api[._]([^_]+)' \ + run --concurrency 4 args: chdir: "{{devstack_base_dir}}/tempest" become: true