Use Fedora 31 for tests
Aso configures swap as before https://review.opendev.org/750941 changed the default swap to 1024MB for jobs and this seems to resulting in high failure rate of the functional and grenade jobs. Let's configure it back to what used to before i.e 8192MB. Change-Id: Ia45e957bb24f5596a5ef16271f71ba8b77df9e42 (cherry picked from commitf18a676792
and cherry picked from commitf419923a0d
)
This commit is contained in:
parent
48b730a31c
commit
cb2ff87cd7
|
@ -29,6 +29,7 @@
|
||||||
- ^heat/tests/.*$
|
- ^heat/tests/.*$
|
||||||
- ^releasenotes/.*$
|
- ^releasenotes/.*$
|
||||||
vars:
|
vars:
|
||||||
|
configure_swap_size: 8192
|
||||||
disable_convergence: 'false'
|
disable_convergence: 'false'
|
||||||
sql: mysql
|
sql: mysql
|
||||||
use_amqp1: 0
|
use_amqp1: 0
|
||||||
|
@ -88,6 +89,7 @@
|
||||||
- ^releasenotes/.*$
|
- ^releasenotes/.*$
|
||||||
- ^setup.cfg$
|
- ^setup.cfg$
|
||||||
vars:
|
vars:
|
||||||
|
configure_swap_size: 8192
|
||||||
topology: aio
|
topology: aio
|
||||||
branch_override: default
|
branch_override: default
|
||||||
|
|
||||||
|
|
|
@ -51,8 +51,8 @@ a VM image that heat can launch. To do that add the following to
|
||||||
`[[local|localrc]]` section of `local.conf`::
|
`[[local|localrc]]` section of `local.conf`::
|
||||||
|
|
||||||
IMAGE_URL_SITE="https://download.fedoraproject.org"
|
IMAGE_URL_SITE="https://download.fedoraproject.org"
|
||||||
IMAGE_URL_PATH="/pub/fedora/linux/releases/25/CloudImages/x86_64/images/"
|
IMAGE_URL_PATH="/pub/fedora/linux/releases/31/CloudImages/x86_64/images/"
|
||||||
IMAGE_URL_FILE="Fedora-Cloud-Base-25-1.3.x86_64.qcow2"
|
IMAGE_URL_FILE="Fedora-Cloud-Base-31-1.9.x86_64.qcow2"
|
||||||
IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE
|
IMAGE_URLS+=","$IMAGE_URL_SITE$IMAGE_URL_PATH$IMAGE_URL_FILE
|
||||||
|
|
||||||
URLs for any cloud image may be specified, but fedora images from F20 contain
|
URLs for any cloud image may be specified, but fedora images from F20 contain
|
||||||
|
|
|
@ -30,4 +30,4 @@ openstack flavor delete m1.heat_int
|
||||||
openstack flavor delete m1.heat_micro
|
openstack flavor delete m1.heat_micro
|
||||||
|
|
||||||
# delete the image created
|
# delete the image created
|
||||||
openstack image delete Fedora-Cloud-Base-30-1.2.x86_64
|
openstack image delete Fedora-Cloud-Base-31-1.9.x86_64
|
||||||
|
|
|
@ -44,9 +44,9 @@ echo "[[local|localrc]]" >> $localconf
|
||||||
# to network
|
# to network
|
||||||
if [[ -e /etc/ci/mirror_info.sh ]]; then
|
if [[ -e /etc/ci/mirror_info.sh ]]; then
|
||||||
source /etc/ci/mirror_info.sh
|
source /etc/ci/mirror_info.sh
|
||||||
echo "IMAGE_URLS+=${NODEPOOL_FEDORA_MIRROR}/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2" >> $localconf
|
echo "IMAGE_URLS+=${NODEPOOL_FEDORA_MIRROR}/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2" >> $localconf
|
||||||
else
|
else
|
||||||
echo "IMAGE_URLS+=https://download.fedoraproject.org/pub/fedora/linux/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2" >> $localconf
|
echo "IMAGE_URLS+=https://download.fedoraproject.org/pub/fedora/linux/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2" >> $localconf
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localconf
|
echo "CEILOMETER_PIPELINE_INTERVAL=60" >> $localconf
|
||||||
|
|
|
@ -46,7 +46,7 @@ function _config_iniset {
|
||||||
iniset $conf_file heat_plugin instance_type m1.heat_int
|
iniset $conf_file heat_plugin instance_type m1.heat_int
|
||||||
iniset $conf_file heat_plugin minimal_instance_type m1.heat_micro
|
iniset $conf_file heat_plugin minimal_instance_type m1.heat_micro
|
||||||
|
|
||||||
iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-30-1.2.x86_64
|
iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-31-1.9.x86_64
|
||||||
iniset $conf_file heat_plugin minimal_image_ref $default_image_name
|
iniset $conf_file heat_plugin minimal_image_ref $default_image_name
|
||||||
iniset $conf_file heat_plugin hidden_stack_tag hidden
|
iniset $conf_file heat_plugin hidden_stack_tag hidden
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue