From 0e515064198f71f8ba388e7fabc93f108faa1891 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 9 Jun 2023 17:09:48 +0900 Subject: [PATCH] Bump Fedora image used in CI Fedora 36 is already EOLed so we should use more recent version. Because guest enters to emergency shell when Fedora 38 (latest at the time of writing) is used, we select Fedora 37 for now. Change-Id: Ie0876080c771fb124d4dd36f803fbfd3b108e240 --- .zuul.yaml | 2 +- devstack/lib/heat | 4 ++-- doc/source/getting_started/on_devstack.rst | 4 ++-- heat_integrationtests/cleanup_test_env.sh | 2 +- heat_integrationtests/prepare_test_env.sh | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.zuul.yaml b/.zuul.yaml index c46fec1d40..19b1ff9dab 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -73,7 +73,7 @@ minimal_image_ref: ${DEFAULT_IMAGE_NAME:-cirros-0.3.6-x86_64-disk} instance_type: m1.heat_int minimal_instance_type: m1.heat_micro - image_ref: Fedora-Cloud-Base-36-1.5.x86_64 + image_ref: Fedora-Cloud-Base-37-1.7.x86_64 hidden_stack_tag: hidden 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 diff --git a/devstack/lib/heat b/devstack/lib/heat index ff5bd94876..1865e4be3a 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -471,14 +471,14 @@ function configure_tempest_for_heat { source /etc/ci/mirror_info.sh fi HEAT_TEST_FEDORA_IMAGE_UPSTREAM=https://download.fedoraproject.org/pub/fedora/linux - HEAT_TEST_FEDORA_IMAGE_PATH=releases/36/Cloud/x86_64/images/Fedora-Cloud-Base-36-1.5.x86_64.qcow2 + HEAT_TEST_FEDORA_IMAGE_PATH=releases/37/Cloud/x86_64/images/Fedora-Cloud-Base-37-1.7.x86_64.qcow2 if curl --output /dev/null --silent --head --fail "${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}"; then export HEAT_TEST_FEDORA_IMAGE="${NODEPOOL_FEDORA_MIRROR}/${HEAT_TEST_FEDORA_IMAGE_PATH}" else export HEAT_TEST_FEDORA_IMAGE="${HEAT_TEST_FEDORA_IMAGE_UPSTREAM}/${HEAT_TEST_FEDORA_IMAGE_PATH}" fi TOKEN=$(openstack token issue -c id -f value) - local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-36-1.5.x86_64" ) + local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-37-1.7.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 64d607ab22..e13b2fc4d9 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/36/Cloud/x86_64/images/" - IMAGE_URL_FILE="Fedora-Cloud-Base-36-1.5.x86_64.qcow2" + IMAGE_URL_PATH="/pub/fedora/linux/releases/37/Cloud/x86_64/images/" + IMAGE_URL_FILE="Fedora-Cloud-Base-37-1.7.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 8cc5fb1ce6..914c39921e 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-36-1.5.x86_64 +openstack image delete Fedora-Cloud-Base-37-1.7.x86_64 diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh index d4e440f73e..a8ee0bdb36 100755 --- a/heat_integrationtests/prepare_test_env.sh +++ b/heat_integrationtests/prepare_test_env.sh @@ -46,7 +46,7 @@ function _config_iniset { 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 image_ref Fedora-Cloud-Base-36-1.5.x86_64 + iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-37-1.7.x86_64 iniset $conf_file heat_plugin minimal_image_ref $default_image_name iniset $conf_file heat_plugin hidden_stack_tag hidden