openstack
/
heat
Code Issues Proposed changes

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.

NOTE(elod.illes): the following changes were made compared to the
original patch:

grenade jobs don't need to be non-voting anymore.

bandit removed B322 test, so it needs to be removed from tox.ini, too.

Fix contradicting lower constraints to make lower-constraints job pass.

Change-Id: Id869f83a46454897c2fe7a532eebfa2863befe5e
(cherry picked from commit 61e53c4eca)
(cherry picked from commit 779b39c975)
This commit is contained in:
Matthias Runge 2020-12-03 14:07:05 +01:00 committed by Elod Illes
parent ec67396a2b
commit e16fbbd13f
8 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

@ -79,7 +79,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-31-1.9.x86_64
image_ref: Fedora-Cloud-Base-32-1.6.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

8
devstack/lib/heat
View File

@ -447,7 +447,9 @@ function create_heat_accounts {
function configure_tempest_for_heat {
# Skip SoftwareConfigIntegrationTest because it requires a custom image
# Skip AutoscalingLoadBalancerTest and AutoscalingLoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
iniset $TEMPEST_CONFIG heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, SoftwareConfigIntegrationTest'
# Skip CfnInitIntegrationTest as latest fedora images don't have heat-cfntools
iniset $TEMPEST_CONFIG heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, SoftwareConfigIntegrationTest, \
CfnInitIntegrationTest'
# Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled
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
source /etc/ci/mirror_info.sh
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)
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 is_service_enabled g-api; then
upload_image $HEAT_TEST_FEDORA_IMAGE $TOKEN

4
doc/source/getting_started/on_devstack.rst
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`::
IMAGE_URL_SITE="https://download.fedoraproject.org"
IMAGE_URL_PATH="/pub/fedora/linux/releases/31/CloudImages/x86_64/images/"
IMAGE_URL_FILE="Fedora-Cloud-Base-31-1.9.x86_64.qcow2"
IMAGE_URL_PATH="/pub/fedora/linux/releases/32/Cloud/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

2
heat_integrationtests/cleanup_test_env.sh
View File

@ -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-31-1.9.x86_64
openstack image delete Fedora-Cloud-Base-32-1.6.x86_64

2
heat_integrationtests/prepare_test_env.sh
View File

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

4
lower-constraints.txt
View File

@ -15,7 +15,7 @@ cmd2==0.8.1
contextlib2==0.5.5
coverage==4.0
croniter==0.3.4
cryptography==2.1
cryptography==2.1.4
debtcollector==1.19.0
decorator==4.2.1
deprecation==2.0
@ -47,7 +47,7 @@ linecache2==1.0.0
lxml==3.4.1
Mako==1.0.7
MarkupSafe==1.0
mccabe==0.2.1
mccabe==0.6.0
mock==2.0.0
monotonic==1.4
msgpack==0.5.6

2
requirements.txt
View File

@ -5,7 +5,7 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0
Babel!=2.4.0,>=2.3.4 # BSD
croniter>=0.3.4 # MIT License
cryptography>=2.1 # BSD/Apache-2.0
cryptography>=2.1.4 # BSD/Apache-2.0
eventlet!=0.18.3,!=0.20.1,!=0.21.0,!=0.23.0,!=0.25.0,>=0.18.2 # MIT
keystoneauth1>=3.18.0 # Apache-2.0
keystonemiddleware>=4.17.0 # Apache-2.0

3
tox.ini
View File

@ -30,14 +30,13 @@ commands =
# B110: Try, Except, Pass detected.
# B310: Audit url open for permitted schemes
# B311: Standard pseudo-random generators are not suitable for security/cryptographic purposes
# B322: The input method is safe in Python 3.
# B404: Import of subprocess module
# B410: Import of lxml module
# B504: Test for SSL use with no version specified
# B506: Test for use of yaml load
# B603: Test for use of subprocess with shell equals true
# B607: Test for starting a process with a partial path
bandit -r heat -x tests --skip B101,B104,B107,B110,B310,B311,B322,B404,B410,B504,B506,B603,B607
bandit -r heat -x tests --skip B101,B104,B107,B110,B310,B311,B404,B410,B504,B506,B603,B607
doc8 {posargs}
[testenv:venv]