diff --git a/doc/source/conf.py b/doc/source/conf.py index 3318b4ed..e91ff68a 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -231,7 +231,7 @@ latex_elements = { # author, documentclass [howto, manual, or own class]). latex_documents = [ (master_doc, 'doc-' + target_name + '.tex', - title.replace("_", "\_"), author, 'manual'), + title.replace("_", r"\_"), author, 'manual'), ] latex_use_xindy = False diff --git a/meta/main.yml b/meta/main.yml index 6cefbbbb..4be4ee42 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -19,24 +19,21 @@ galaxy_info: description: Installation and setup of tempest company: Rackspace license: Apache2 - min_ansible_version: 2.2 + min_ansible_version: 2.10 platforms: - name: Debian versions: - stretch - name: Ubuntu versions: - - xenial - bionic + - focal - name: EL versions: - - 7 + - 8 - name: CentOS versions: - - 7 - - name: opensuse - versions: - - 15 + - 8 galaxy_tags: - cloud - python diff --git a/tasks/tempest_resources.yml b/tasks/tempest_resources.yml index a3992622..421f5c38 100644 --- a/tasks/tempest_resources.yml +++ b/tasks/tempest_resources.yml @@ -51,6 +51,8 @@ until: fetch_url is success retries: 6 delay: 5 + tags: + - skip_ansible_lint - name: Upload tempest images to glance openstack.cloud.os_image: diff --git a/vars/gentoo.yml b/vars/gentoo.yml deleted file mode 100644 index f5bc7d44..00000000 --- a/vars/gentoo.yml +++ /dev/null @@ -1,25 +0,0 @@ ---- -# Copyright 2019, Matthew Thode -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -tempest_distro_packages: - - dev-vcs/git - - dev-libs/libxslt # required by the python module unittest2 - -tempest_service_distro_packages: - - tempest - - dev-python/junit-xml - - dev-python/subunit - -tempest_plugin_distro_packages: [] diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml deleted file mode 100644 index c38797fc..00000000 --- a/vars/redhat-7.yml +++ /dev/null @@ -1,48 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# Copyright 2018, Red Hat, Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -tempest_distro_packages: - - git - - libxslt # required by the python module unittest2 - - gcc # required to build tempest plugins (TODO) remove this when the repo server can satisfy the tempest plugin requirements - - iputils - -tempest_service_distro_packages: - - openstack-tempest - - python-subunit - - subunit-filters - -tempest_plugin_distro_packages: - - "{{ (tempest_service_available_aodh | bool) | ternary('python-telemetry-tests-tempest', '') }}" - - "{{ (tempest_service_available_barbican | bool) | ternary('python-barbican-tests-tempest', '') }}" - - "{{ (tempest_service_available_ceilometer | bool) | ternary('python-telemetry-tests-tempest', '') }}" - - "{{ (tempest_service_available_cinder | bool) | ternary('python-cinder-tests-tempest', '') }}" - - "{{ (tempest_service_available_congress | bool) | ternary('python-congress-tests-tempest', '') }}" - - "{{ (tempest_service_available_designate | bool) | ternary('python-designate-tests-tempest', '') }}" - - "{{ (tempest_service_available_heat | bool) | ternary('python-heat-tests-tempest', '') }}" - - "{{ tempest_service_available_horizon | bool | ternary('python-horizon-tests-tempest', '') }}" - - "{{ (tempest_service_available_ironic | bool) | ternary('python-ironic-tests-tempest', '') }}" - - python-keystone-tests-tempest - - "{{ (tempest_service_available_magnum | bool) | ternary('python-magnum-tests-tempest', '') }}" - - "{{ (tempest_service_available_manila | bool) | ternary('python-manila-tests-tempest', '') }}" - - "{{ (tempest_service_available_mistral | bool) | ternary('python-mistral-tests-tempest', '') }}" - - "{{ (tempest_service_available_murano | bool) | ternary('python-murano-tests-tempest', '') }}" - - "{{ (tempest_service_available_neutron | bool) | ternary('python-neutron-tests-tempest', '') }}" - - "{{ (tempest_service_available_neutron_vpnaas | bool) | ternary('python-networking-vpnaas-tests', '') }}" - - "{{ (tempest_service_available_novajoin | bool) | ternary('python-novajoin-tests-tempest', '') }}" - - "{{ (tempest_service_available_octavia | bool) | ternary('python-octavia-tests-tempest', '') }}" - - "{{ (tempest_service_available_sahara | bool) | ternary('python-sahara-tests-tempest', '') }}" - - "{{ (tempest_service_available_zaqar | bool) | ternary('python-zaqar-tests-tempest', '') }}" diff --git a/vars/suse.yml b/vars/suse.yml deleted file mode 100644 index 6a2cd1ce..00000000 --- a/vars/suse.yml +++ /dev/null @@ -1,41 +0,0 @@ ---- -# Copyright 2016, Rackspace US, Inc. -# Copyright 2017, SUSE LINUX GmbH. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -tempest_distro_packages: - - git-core - -_stestr_executable: stestr - -tempest_service_distro_packages: - - openstack-tempest-test - - python3-python-subunit - - python3-stestr - - python-junitxml - - iputils - -tempest_plugin_distro_packages: - - python3-keystone-tempest-plugin - - "{{ ((tempest_service_available_aodh | bool) or (tempest_service_available_ceilometer | bool)) | ternary('python3-telemetry-tempest-plugin','') }}" - - "{{ (tempest_service_available_barbican | bool) | ternary('python3-barbican-tempest-plugin', '') }}" - - "{{ (tempest_service_available_cinder | bool) | ternary('python3-cinder-tempest-plugin', '') }}" - - "{{ (tempest_service_available_designate | bool) | ternary('python3-designate-tempest-plugin','') }}" - - "{{ (tempest_service_available_heat | bool) | ternary('python3-heat-tempest-plugin', '') }}" - - "{{ (tempest_service_available_ironic | bool) | ternary('python3-ironic-tempest-plugin', '') }}" - - "{{ (tempest_service_available_magnum | bool) | ternary('python3-magnum-tempest-plugin','') }}" - - "{{ (tempest_service_available_manila | bool) | ternary('python3-manila-tempest-plugin','') }}" - - "{{ (tempest_service_available_neutron | bool) | ternary('python3-neutron-tempest-plugin', '') }}" - - "{{ (tempest_service_available_octavia | bool) | ternary('python3-octavia-tempest-plugin', '') }}" - - "{{ (tempest_use_tempestconf | bool) | ternary('python3-python-tempestconf', '') }}" diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml index fbd3bb8d..0cdd0900 100644 --- a/zuul.d/project.yaml +++ b/zuul.d/project.yaml @@ -30,11 +30,7 @@ tox_environment: PYTEST_REQPASS: 1 - tripleo-ci-centos-8-standalone - - openstack-ansible-deploy-aio_distro_metal-ubuntu-bionic: - voting: false gate: jobs: - openstack-ansible-deploy-aio_distro_metal_tempestconf-centos-8 - tripleo-ci-centos-8-standalone - - openstack-ansible-deploy-aio_distro_metal-ubuntu-bionic: - voting: false