diff -Nru heat-tempest-plugin-1.7.1/debian/changelog heat-tempest-plugin-2.0.0/debian/changelog --- heat-tempest-plugin-1.7.1/debian/changelog 2023-08-14 16:05:26.000000000 +0000 +++ heat-tempest-plugin-2.0.0/debian/changelog 2023-10-05 12:13:50.000000000 +0000 @@ -1,3 +1,10 @@ +heat-tempest-plugin (2.0.0-1) unstable; urgency=medium + + * New upstream release. + * Cleans better. + + -- Thomas Goirand Thu, 05 Oct 2023 14:13:50 +0200 + heat-tempest-plugin (1.7.1-3) unstable; urgency=medium * Cleans properly (Closes: #1045029). diff -Nru heat-tempest-plugin-1.7.1/debian/rules heat-tempest-plugin-2.0.0/debian/rules --- heat-tempest-plugin-1.7.1/debian/rules 2023-08-14 16:05:26.000000000 +0000 +++ heat-tempest-plugin-2.0.0/debian/rules 2023-10-05 12:13:50.000000000 +0000 @@ -8,7 +8,7 @@ override_dh_auto_clean: python3 setup.py clean - rm -rf build + rm -rf build *.egg-info override_dh_auto_test: echo "Do nothing..." diff -Nru heat-tempest-plugin-1.7.1/heat_tempest_plugin/tests/scenario/test_base_resources.py heat-tempest-plugin-2.0.0/heat_tempest_plugin/tests/scenario/test_base_resources.py --- heat-tempest-plugin-1.7.1/heat_tempest_plugin/tests/scenario/test_base_resources.py 2022-10-16 03:32:57.000000000 +0000 +++ heat-tempest-plugin-2.0.0/heat_tempest_plugin/tests/scenario/test_base_resources.py 2023-09-23 06:31:35.000000000 +0000 @@ -21,10 +21,10 @@ def setUp(self): super(BasicResourcesTest, self).setUp() - if not self.conf.image_ref: - raise self.skipException("No image configured to test") - if not self.conf.instance_type: - raise self.skipException("No flavor configured to test") + if not self.conf.minimal_image_ref: + raise self.skipException("No minimal image configured to test") + if not self.conf.minimal_instance_type: + raise self.skipException("No minimal flavor configured to test") def check_stack(self): sid = self.stack_identifier @@ -55,8 +55,8 @@ self.private_net_name = test.rand_name('heat-net') parameters = { 'key_name': test.rand_name('heat-key'), - 'flavor': self.conf.instance_type, - 'image': self.conf.image_ref, + 'flavor': self.conf.minimal_instance_type, + 'image': self.conf.minimal_image_ref, 'vol_size': self.conf.volume_size, 'private_net_name': self.private_net_name } diff -Nru heat-tempest-plugin-1.7.1/heat_tempest_plugin/tests/scenario/test_octavia_lbaas.py heat-tempest-plugin-2.0.0/heat_tempest_plugin/tests/scenario/test_octavia_lbaas.py --- heat-tempest-plugin-1.7.1/heat_tempest_plugin/tests/scenario/test_octavia_lbaas.py 2022-10-16 03:32:57.000000000 +0000 +++ heat-tempest-plugin-2.0.0/heat_tempest_plugin/tests/scenario/test_octavia_lbaas.py 2023-09-23 06:31:35.000000000 +0000 @@ -23,6 +23,10 @@ self.template_name = 'octavia_lbaas.yaml' self.member_template_name = 'lb_member.yaml' self.sub_dir = 'templates' + if not self.conf.minimal_image_ref: + raise self.skipException("No minimal image configured to test") + if not self.conf.minimal_instance_type: + raise self.skipException("No minimal flavor configured to test") def _create_stack(self): self.parameters = { diff -Nru heat-tempest-plugin-1.7.1/heat_tempest_plugin/tests/scenario/test_server_signal.py heat-tempest-plugin-2.0.0/heat_tempest_plugin/tests/scenario/test_server_signal.py --- heat-tempest-plugin-1.7.1/heat_tempest_plugin/tests/scenario/test_server_signal.py 2022-10-16 03:32:57.000000000 +0000 +++ heat-tempest-plugin-2.0.0/heat_tempest_plugin/tests/scenario/test_server_signal.py 2023-09-23 06:31:35.000000000 +0000 @@ -81,6 +81,10 @@ @decorators.idempotent_id('8da0f6cc-60e6-4298-9e54-e1f905c5552a') def test_server_signal_userdata_format_raw(self): + if not self.conf.minimal_image_ref: + raise self.skipException("No minimal image configured to test") + if not self.conf.minimal_instance_type: + raise self.skipException("No minimal flavor configured to test") self._test_server_signal(image=self.conf.minimal_image_ref, flavor=self.conf.minimal_instance_type) @@ -88,6 +92,8 @@ def test_server_signal_userdata_format_software_config(self): if not self.conf.image_ref: raise self.skipException("No image configured to test") + if not self.conf.instance_type: + raise self.skipException("No flavor configured to test") self._test_server_signal(user_data_format='SOFTWARE_CONFIG', image=self.conf.image_ref, flavor=self.conf.instance_type) diff -Nru heat-tempest-plugin-1.7.1/requirements.txt heat-tempest-plugin-2.0.0/requirements.txt --- heat-tempest-plugin-1.7.1/requirements.txt 2022-10-16 03:32:57.000000000 +0000 +++ heat-tempest-plugin-2.0.0/requirements.txt 2023-09-23 06:31:35.000000000 +0000 @@ -1,6 +1,3 @@ -# The order of packages is significant, because pip processes them in the order -# of appearance. Changing the order has an impact on the overall integration -# process, which may cause wedges in the gate later. keystoneauth1>=3.4.0 # Apache-2.0 oslo.config>=5.2.0 # Apache-2.0 oslo.log>=3.36.0 # Apache-2.0 diff -Nru heat-tempest-plugin-1.7.1/setup.cfg heat-tempest-plugin-2.0.0/setup.cfg --- heat-tempest-plugin-1.7.1/setup.cfg 2022-10-16 03:32:57.000000000 +0000 +++ heat-tempest-plugin-2.0.0/setup.cfg 2023-09-23 06:31:35.000000000 +0000 @@ -6,6 +6,7 @@ author = OpenStack author_email = openstack-discuss@lists.openstack.org home_page = http://docs.openstack.org/developer/heat-tempest-plugin +python_requires = >=3.6 classifier = Environment :: OpenStack Intended Audience :: Information Technology @@ -14,9 +15,11 @@ Operating System :: POSIX :: Linux Programming Language :: Python Programming Language :: Python :: 3 - Programming Language :: Python :: 3.5 Programming Language :: Python :: 3.6 Programming Language :: Python :: 3.7 + Programming Language :: Python :: 3.8 + Programming Language :: Python :: 3.9 + Programming Language :: Python :: 3.10 keywords = setup diff -Nru heat-tempest-plugin-1.7.1/setup.py heat-tempest-plugin-2.0.0/setup.py --- heat-tempest-plugin-1.7.1/setup.py 2022-10-16 03:32:57.000000000 +0000 +++ heat-tempest-plugin-2.0.0/setup.py 2023-09-23 06:31:35.000000000 +0000 @@ -13,17 +13,8 @@ # See the License for the specific language governing permissions and # limitations under the License. -# THIS FILE IS MANAGED BY THE GLOBAL REQUIREMENTS REPO - DO NOT EDIT import setuptools -# In python < 2.7.4, a lazy loading of package `pbr` will break -# setuptools if some other modules registered functions in `atexit`. -# solution from: http://bugs.python.org/issue15881#msg170215 -try: - import multiprocessing # noqa -except ImportError: - pass - setuptools.setup( setup_requires=['pbr>=2.0.0'], pbr=True) diff -Nru heat-tempest-plugin-1.7.1/.zuul.yaml heat-tempest-plugin-2.0.0/.zuul.yaml --- heat-tempest-plugin-1.7.1/.zuul.yaml 2022-10-16 03:32:57.000000000 +0000 +++ heat-tempest-plugin-2.0.0/.zuul.yaml 2023-09-23 06:31:35.000000000 +0000 @@ -1,4 +1,10 @@ - job: + name: heat-functional-2023-1 + parent: heat-functional + nodeset: openstack-single-node-jammy + override-checkout: stable/2023.1 + +- job: name: heat-functional-zed parent: heat-functional nodeset: openstack-single-node-focal @@ -10,18 +16,6 @@ nodeset: openstack-single-node-focal override-checkout: stable/yoga -- job: - name: heat-functional-xena - parent: heat-functional - nodeset: openstack-single-node-focal - override-checkout: stable/xena - -- job: - name: heat-functional-wallaby - parent: heat-functional - nodeset: openstack-single-node-focal - override-checkout: stable/wallaby - - project: queue: heat templates: @@ -31,10 +25,9 @@ jobs: - heat-functional - heat-functional-legacy + - heat-functional-2023-1 - heat-functional-zed - heat-functional-yoga - - heat-functional-xena - - heat-functional-wallaby gate: jobs: - heat-functional