Use Fedora 31 for tests

Change-Id: Ia45e957bb24f5596a5ef16271f71ba8b77df9e42
This commit is contained in:
Rabi Mishra 2020-05-11 17:16:38 +05:30
parent 6d697ad2f0
commit f18a676792
5 changed files with 7 additions and 7 deletions

View File

@ -78,7 +78,7 @@
minimal_image_ref: ${DEFAULT_IMAGE_NAME:-cirros-0.3.6-x86_64-disk} minimal_image_ref: ${DEFAULT_IMAGE_NAME:-cirros-0.3.6-x86_64-disk}
instance_type: m1.heat_int instance_type: m1.heat_int
minimal_instance_type: m1.heat_micro minimal_instance_type: m1.heat_micro
image_ref: Fedora-Cloud-Base-30-1.2.x86_64 image_ref: Fedora-Cloud-Base-31-1.9.x86_64
hidden_stack_tag: hidden hidden_stack_tag: hidden
heat_config_notify_script: /opt/stack/heat-agents/heat-config/bin/heat-config-notify heat_config_notify_script: /opt/stack/heat-agents/heat-config/bin/heat-config-notify
boot_config_env: /opt/stack/heat-templates/hot/software-config/boot-config/test_image_env.yaml boot_config_env: /opt/stack/heat-templates/hot/software-config/boot-config/test_image_env.yaml

View File

@ -476,9 +476,9 @@ function configure_tempest_for_heat {
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
fi fi
export HEAT_TEST_FEDORA_IMAGE=${NODEPOOL_FEDORA_MIRROR:-https://download.fedoraproject.org/pub/fedora/linux}/releases/30/Cloud/x86_64/images/Fedora-Cloud-Base-30-1.2.x86_64.qcow2 export HEAT_TEST_FEDORA_IMAGE=${NODEPOOL_FEDORA_MIRROR:-https://download.fedoraproject.org/pub/fedora/linux}/releases/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.x86_64.qcow2
TOKEN=$(openstack token issue -c id -f value) TOKEN=$(openstack token issue -c id -f value)
local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-30-1.2.x86_64" ) local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-31-1.9.x86_64" )
if [[ -z $image_exists ]]; then if [[ -z $image_exists ]]; then
if is_service_enabled g-api; then if is_service_enabled g-api; then
upload_image $HEAT_TEST_FEDORA_IMAGE $TOKEN upload_image $HEAT_TEST_FEDORA_IMAGE $TOKEN

View File

@ -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

View File

@ -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

View File

@ -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