Merge "Bump Fedora image used in CI"
This commit is contained in:
commit
019483a0bc
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Reference in New Issue