From 2441b55aacd45cdcb8bf844852b2e293db3d6340 Mon Sep 17 00:00:00 2001 From: Dmitriy Rabotyagov Date: Mon, 22 May 2023 17:32:54 +0200 Subject: [PATCH] Clean up old rhel variable files We don't support neither redhat 7 nor redhat 8 as of today, so we can safely clean-up variable files for these distros. Change-Id: I1225fd75d25c3a06353b46ddb61f989b73a757b6 --- vars/redhat-7.yml | 50 --------------------------------------- vars/redhat-8.yml | 59 ----------------------------------------------- 2 files changed, 109 deletions(-) delete mode 100644 vars/redhat-7.yml delete mode 100644 vars/redhat-8.yml diff --git a/vars/redhat-7.yml b/vars/redhat-7.yml deleted file mode 100644 index 804d7805..00000000 --- a/vars/redhat-7.yml +++ /dev/null @@ -1,50 +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_devel_distro_packages: - - python3-devel # required for netifaces module for stackviz - -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_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/redhat-8.yml b/vars/redhat-8.yml deleted file mode 100644 index 0a40aa49..00000000 --- a/vars/redhat-8.yml +++ /dev/null @@ -1,59 +0,0 @@ ---- -# Copyright 2019, 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 - - nmap # provides ncat tool which is required by some of the neutron-tempest-plugin scenario tests - -_stestr_executable: stestr-3 - -# NOTE(chandankumar): It is needed by python_venv_build ansible role to create -# virtualenv. By default venv_python_executable var sets to python2, changing it -# in the role itself, breaks other roles. So for distros using python3 making the -# change here fixes the issue. -_tempest_venv_python_executable: "python3" - -tempest_service_distro_packages: - - openstack-tempest - - python3-subunit - - subunit-filters - -tempest_devel_distro_packages: - - python3-devel # required for netifaces module for stackviz - -tempest_plugin_distro_packages: - - "{{ (tempest_service_available_aodh | bool) | ternary('python3-telemetry-tests-tempest', '') }}" - - "{{ (tempest_service_available_barbican | bool) | ternary('python3-barbican-tests-tempest', '') }}" - - "{{ (tempest_service_available_ceilometer | bool) | ternary('python3-telemetry-tests-tempest', '') }}" - - "{{ (tempest_service_available_cinder | bool) | ternary('python3-cinder-tests-tempest', '') }}" - - "{{ (tempest_service_available_designate | bool) | ternary('python3-designate-tests-tempest', '') }}" - - "{{ (tempest_service_available_heat | bool) | ternary('python3-heat-tests-tempest', '') }}" - - "{{ (tempest_service_available_ironic | bool) | ternary('python3-ironic-tests-tempest', '') }}" - - python3-keystone-tests-tempest - - "{{ (tempest_service_available_magnum | bool) | ternary('python3-magnum-tests-tempest', '') }}" - - "{{ (tempest_service_available_manila | bool) | ternary('python3-manila-tests-tempest', '') }}" - - "{{ (tempest_service_available_mistral | bool) | ternary('python3-mistral-tests-tempest', '') }}" - - "{{ (tempest_service_available_murano | bool) | ternary('python3-murano-tests-tempest', '') }}" - - "{{ (tempest_service_available_neutron | bool) | ternary('python3-neutron-tests-tempest', '') }}" - - "{{ (tempest_service_available_neutron_vpnaas | bool) | ternary('python3-networking-vpnaas-tests', '') }}" - - "{{ (tempest_service_available_novajoin | bool) | ternary('python3-novajoin-tests-tempest', '') }}" - - "{{ (tempest_service_available_octavia | bool) | ternary('python3-octavia-tests-tempest', '') }}" - - "{{ (tempest_service_available_sahara | bool) | ternary('python3-sahara-tests-tempest', '') }}" - - "{{ (tempest_service_available_whitebox | bool) | ternary('python3-whitebox-tests-tempest', '') }}" - - "{{ (tempest_service_available_whitebox_neutron | bool) | ternary('python3-whitebox-neutron-tests-tempest', '') }}" - - "{{ (tempest_service_available_zaqar | bool) | ternary('python3-zaqar-tests-tempest', '') }}"