From 46a6d5fa4bbeac30c4d58b5b8953529c5ae48a04 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Sun, 17 Dec 2023 01:44:11 +0900 Subject: [PATCH] Remove references to Neutron LBaaS tests ... because these tests are already removed. Depends-on: https://review.opendev.org/c/openstack/heat-tempest-plugin/+/896184 Change-Id: I34f75971fec826032377c47bf7b4e7a380522b8f --- devstack/lib/heat | 5 +---- heat_integrationtests/prepare_test_env.sh | 8 ++------ 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/devstack/lib/heat b/devstack/lib/heat index 799f23a4c0..895ff665b0 100644 --- a/devstack/lib/heat +++ b/devstack/lib/heat @@ -449,8 +449,6 @@ function create_heat_accounts { function configure_tempest_for_heat { # Skip SoftwareConfigIntegrationTest because it requires a custom image SKIP_SCENARIO_TEST_LIST='SoftwareConfigIntegrationTest' - # Skip AutoscalingLoadBalancerTest and AutoscalingLoadBalancerv2Test as deprecated neutron-lbaas service is not enabled - SKIP_SCENARIO_TEST_LIST+=',AutoscalingLoadBalancerTest,AutoscalingLoadBalancerv2Test' SKIP_SCENARIO_TEST_LIST+=',AodhAlarmTest' # Skip CfnInitIntegrationTest as latest fedora images don't have heat-cfntools SKIP_SCENARIO_TEST_LIST+=',CfnInitIntegrationTest' @@ -461,8 +459,7 @@ function configure_tempest_for_heat { fi iniset $TEMPEST_CONFIG heat_plugin skip_scenario_test_list $SKIP_SCENARIO_TEST_LIST - # Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled. - SKIP_FUNCTIONAL_TEST_LIST='LoadBalancerv2Test,NotificationTest' + SKIP_FUNCTIONAL_TEST_LIST='NotificationTest' if is_ubuntu; then # Skip a few tests failing because of a known libvirt issue in Jammy # https://bugs.launchpad.net/nova/+bug/1998274 diff --git a/heat_integrationtests/prepare_test_env.sh b/heat_integrationtests/prepare_test_env.sh index a8ee0bdb36..8b0a399bdd 100755 --- a/heat_integrationtests/prepare_test_env.sh +++ b/heat_integrationtests/prepare_test_env.sh @@ -88,13 +88,9 @@ function _config_tempest_plugin iniset $conf_file heat_plugin heat_plugin credential_secret_id $OS_CREDENTIAL_SECRET_ID # Skip SoftwareConfigIntegrationTest because it requires a custom image - # Skip VolumeBackupRestoreIntegrationTest skipped until failure rate can be reduced ref bug #1382300 - # Skip AutoscalingLoadBalancerTest and AutoscalingLoadBalancerv2Test as deprecated neutron-lbaas service is not enabled - iniset $conf_file heat_plugin skip_scenario_test_list 'AutoscalingLoadBalancerTest, AutoscalingLoadBalancerv2Test, \ - SoftwareConfigIntegrationTest' + iniset $conf_file heat_plugin skip_scenario_test_list 'SoftwareConfigIntegrationTest' - # Skip LoadBalancerv2Test as deprecated neutron-lbaas service is not enabled - iniset $conf_file heat_plugin skip_functional_test_list 'LoadBalancerv2Test' + iniset $conf_file heat_plugin skip_functional_test_list '' # disable cinder backup feature iniset $conf_file volume-feature-enabled backup False