From 710fee20b9ea0f4ea2ff7c57cf7a8f31a74294d7 Mon Sep 17 00:00:00 2001 From: Rabi Mishra Date: Mon, 11 May 2020 17:16:38 +0530 Subject: [PATCH] Use Fedora 32 for tests Change-Id: Ia45e957bb24f5596a5ef16271f71ba8b77df9e42 --- devstack/lib/heat | 4 ++-- doc/source/getting_started/on_devstack.rst | 4 ++-- heat_integrationtests/cleanup_test_env.sh | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/devstack/lib/heat b/devstack/lib/heat index 989b3efb9e..64a9032479 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -476,9 +476,9 @@ function configure_tempest_for_heat { if [[ -e /etc/ci/mirror_info.sh ]]; then source /etc/ci/mirror_info.sh 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/32/Cloud/x86_64/images/Fedora-Cloud-Base-32-1.6.x86_64.qcow2 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-32-1.6.x86_64" ) if [[ -z $image_exists ]]; then if is_service_enabled g-api; then upload_image $HEAT_TEST_FEDORA_IMAGE $TOKEN diff --git a/doc/source/getting_started/on_devstack.rst b/doc/source/getting_started/on_devstack.rst index ae5ecaa3a5..830ad97f27 100644 --- a/doc/source/getting_started/on_devstack.rst +++ b/doc/source/getting_started/on_devstack.rst @@ -51,8 +51,8 @@ a VM image that heat can launch. To do that add the following to `[[local|localrc]]` section of `local.conf`:: IMAGE_URL_SITE="https://download.fedoraproject.org" - IMAGE_URL_PATH="/pub/fedora/linux/releases/25/CloudImages/x86_64/images/" - IMAGE_URL_FILE="Fedora-Cloud-Base-25-1.3.x86_64.qcow2" + IMAGE_URL_PATH="/pub/fedora/linux/releases/32/CloudImages/x86_64/images/" + IMAGE_URL_FILE="Fedora-Cloud-Base-32-1.6.x86_64.qcow2" 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 diff --git a/heat_integrationtests/cleanup_test_env.sh b/heat_integrationtests/cleanup_test_env.sh index 4bfeb4f518..30196a2307 100755 --- a/heat_integrationtests/cleanup_test_env.sh +++ b/heat_integrationtests/cleanup_test_env.sh @@ -30,4 +30,4 @@ openstack flavor delete m1.heat_int openstack flavor delete m1.heat_micro # delete the image created -openstack image delete Fedora-Cloud-Base-30-1.2.x86_64 +openstack image delete Fedora-Cloud-Base-32-1.6.x86_64