Replace Fedora test image with F32

Fedora 31 was retired and the image is gone from mirrors.
heat-cfntools have been dropped from fedora images, disable
the test till that's resolved.

Also makes grenade job non-voting, till this is backported
to stable/victoria.

Change-Id: Id869f83a46454897c2fe7a532eebfa2863befe5e
(cherry picked from commit 61e53c4eca)
This commit is contained in:
Matthias Runge 2020-12-03 14:07:05 +01:00 committed by Rico Lin
parent 3f98fd9b1d
commit 779b39c975
5 changed files with 12 additions and 8 deletions

View File

@ -75,7 +75,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-31-1.9.x86_64 image_ref: Fedora-Cloud-Base-32-1.6.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
@ -136,6 +136,7 @@
- job: - job:
name: grenade-heat name: grenade-heat
parent: grenade parent: grenade
voting: false
required-projects: required-projects:
- opendev.org/openstack/heat - opendev.org/openstack/heat
- opendev.org/openstack/heat-tempest-plugin - opendev.org/openstack/heat-tempest-plugin
@ -159,6 +160,7 @@
name: grenade-heat-multinode name: grenade-heat-multinode
parent: grenade-heat parent: grenade-heat
nodeset: openstack-two-node-bionic nodeset: openstack-two-node-bionic
voting: false
- project: - project:
templates: templates:

View File

@ -447,7 +447,9 @@ function create_heat_accounts {
function configure_tempest_for_heat { function configure_tempest_for_heat {
# Skip SoftwareConfigIntegrationTest because it requires a custom image # Skip SoftwareConfigIntegrationTest because it requires a custom image
# Skip AutoscalingLoadBalancerTest and AutoscalingLoadBalancerv2Test as deprecated neutron-lbaas service is not enabled # Skip AutoscalingLoadBalancerTest and AutoscalingLoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
iniset $TEMPEST_CONFIG heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, SoftwareConfigIntegrationTest, AodhAlarmTest' # Skip CfnInitIntegrationTest as latest fedora images don't have heat-cfntools
iniset $TEMPEST_CONFIG heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, \
SoftwareConfigIntegrationTest, AodhAlarmTest, CfnInitIntegrationTest'
# Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled # Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
iniset $TEMPEST_CONFIG heat_plugin skip_functional_test_list 'LoadBalancerv2Test, NotificationTest' iniset $TEMPEST_CONFIG heat_plugin skip_functional_test_list 'LoadBalancerv2Test, NotificationTest'
@ -476,9 +478,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/31/Cloud/x86_64/images/Fedora-Cloud-Base-31-1.9.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) TOKEN=$(openstack token issue -c id -f value)
local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-31-1.9.x86_64" ) local image_exists=$( openstack image list | grep "Fedora-Cloud-Base-32-1.6.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/31/CloudImages/x86_64/images/" IMAGE_URL_PATH="/pub/fedora/linux/releases/32/Cloud/x86_64/images/"
IMAGE_URL_FILE="Fedora-Cloud-Base-31-1.9.x86_64.qcow2" IMAGE_URL_FILE="Fedora-Cloud-Base-32-1.6.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-31-1.9.x86_64 openstack image delete Fedora-Cloud-Base-32-1.6.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-31-1.9.x86_64 iniset $conf_file heat_plugin image_ref Fedora-Cloud-Base-32-1.6.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