diff options
| -rw-r--r-- | README.rst | 1 | ||||
| -rw-r--r-- | doc/source/matrix_aarch64.csv | 1 | ||||
| -rw-r--r-- | doc/source/matrix_x86.csv | 1 | ||||
| -rw-r--r-- | docker/tempest/Dockerfile.j2 | 69 | ||||
| -rw-r--r-- | docker/tempest/extend_start.sh | 10 | ||||
| -rwxr-xr-x | kolla/common/config.py | 82 | ||||
| -rwxr-xr-x | kolla/image/build.py | 1 | ||||
| -rw-r--r-- | releasenotes/notes/remove-tempest-ffa7526963eae898.yaml | 5 | ||||
| -rw-r--r-- | roles/kolla-build-config/defaults/main.yml | 22 | ||||
| -rwxr-xr-x | tools/version-check.py | 19 |
10 files changed, 6 insertions, 205 deletions
diff --git a/README.rst b/README.rst index c4c56c5cd..7f65ca23d 100644 --- a/README.rst +++ b/README.rst @@ -98,7 +98,6 @@ Kolla provides images to deploy the following OpenStack projects: - `Solum <https://docs.openstack.org/solum/latest/>`__ - `Swift <https://docs.openstack.org/swift/latest/>`__ - `Tacker <https://docs.openstack.org/tacker/latest/>`__ -- `Tempest <https://docs.openstack.org/tempest/latest/>`__ [deprecated] - `Trove <https://docs.openstack.org/trove/latest/>`__ - `Vitrage <https://docs.openstack.org/vitrage/latest/>`__ - `Vmtp <https://vmtp.readthedocs.io/en/latest/>`__ diff --git a/doc/source/matrix_aarch64.csv b/doc/source/matrix_aarch64.csv index e1a92088b..ca14eff6b 100644 --- a/doc/source/matrix_aarch64.csv +++ b/doc/source/matrix_aarch64.csv @@ -66,7 +66,6 @@ storm,C,C,C,C,N,C swift,C,C,C,C,N,C tacker,C,C,N,C,N,C telegraf,N,N,N,N,N,N -tempest (deprecated),C,N,C,N,N,N tgtd,C,C,C,C,N,C trove,C,C,N,C,N,C vitrage,C,C,N,C,N,C diff --git a/doc/source/matrix_x86.csv b/doc/source/matrix_x86.csv index 0fead393b..680fbd3cf 100644 --- a/doc/source/matrix_x86.csv +++ b/doc/source/matrix_x86.csv @@ -67,7 +67,6 @@ storm,C,C,C,C,C,C swift,C,T,C,T,C,C tacker,C,T,N,C,N,C telegraf,C,C,C,C,C,N -tempest (deprecated),C,C,C,C,C,C tgtd,N,N,C,T,C,C trove,C,C,C,C,N,C vitrage,C,C,N,C,C,C diff --git a/docker/tempest/Dockerfile.j2 b/docker/tempest/Dockerfile.j2 deleted file mode 100644 index 93a73e2f5..000000000 --- a/docker/tempest/Dockerfile.j2 +++ /dev/null @@ -1,69 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}openstack-base:{{ tag }} -{% block labels %} -LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build_date }}" -{% endblock %} - -# tempest image is deprecated - -{% block tempest_header %}{% endblock %} - -{% import "macros.j2" as macros with context %} - -{{ macros.enable_extra_repos(['openvswitch', 'powertools']) }} -{{ macros.configure_user(name='tempest') }} - -{% if install_type == 'binary' %} - {% if base_package_type == 'rpm' %} - {% set tempest_packages = ['openstack-tempest-all', - 'iputils'] %} - - {% elif base_package_type == 'deb' %} - {% set tempest_packages = ['tempest', - 'iputils-ping'] %} - - {% endif %} - -{{ macros.install_packages(tempest_packages | customizable("packages")) }} -RUN ln -sf /var/lib/tempest /tempest - -{% elif install_type == 'source' %} - -ADD tempest-archive /tempest-source -ADD plugins-archive / - -{% if base_package_type == 'deb' and base_arch not in ['x86_64'] %} - {% set tempest_source_packages = ['librdkafka-dev'] %} - -{{ macros.install_packages(tempest_source_packages | customizable("source_packages")) }} -{% endif %} - - -{% set tempest_pip_packages = [ - '/tempest' -] %} - -{% set tempest_plugins_pip_packages = [ - '/plugins/*' -] %} - -# NOTE(Jeffrey4l): remove the tempest version constraint in the -# upper-constrains.txt file. Otherwise, it will be failed. -RUN ln -s tempest-source/* tempest \ - && sed -i 's/^tempest===.*$//' requirements/upper-constraints.txt \ - && {{ macros.install_pip(tempest_pip_packages | customizable("pip_packages")) }} \ - && if [ "$(ls /plugins)" ]; then \ - {{ macros.install_pip(tempest_plugins_pip_packages) }}; \ - fi \ - && mkdir -p /etc/tempest /var/log/tempest /etc/tempest/tempest_lock - -{% endif %} - -WORKDIR /tempest - -COPY extend_start.sh /usr/local/bin/kolla_extend_start -RUN chmod 755 /usr/local/bin/kolla_extend_start - -{% block tempest_footer %}{% endblock %} -{% block footer %}{% endblock %} - -USER tempest diff --git a/docker/tempest/extend_start.sh b/docker/tempest/extend_start.sh deleted file mode 100644 index 974376afc..000000000 --- a/docker/tempest/extend_start.sh +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/bash - -echo "tempest image is deprecated" - -if [[ ! -d "/var/log/kolla/tempest" ]]; then - mkdir -p /var/log/kolla/tempest -fi -if [[ $(stat -c %a /var/log/kolla/tempest) != "755" ]]; then - chmod 755 /var/log/kolla/tempest -fi diff --git a/kolla/common/config.py b/kolla/common/config.py index 56887b398..ff44753e7 100755 --- a/kolla/common/config.py +++ b/kolla/common/config.py @@ -564,82 +564,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/placement/' 'placement-${openstack_branch}.tar.gz')}, - 'tempest-plugin-tempest-conf': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/python-tempestconf/' - 'python-tempestconf-master.tar.gz')}, - 'tempest-plugin-barbican': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/barbican-tempest-plugin/' - 'barbican_tempest_plugin-1.3.0.tar.gz')}, - 'tempest-plugin-blazar': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/blazar-tempest-plugin/' - 'blazar_tempest_plugin-0.6.1.tar.gz')}, - 'tempest-plugin-cinder': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/cinder-tempest-plugin/' - 'cinder-tempest-plugin-1.4.0.tar.gz')}, - 'tempest-plugin-ec2api': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/ec2api-tempest-plugin/' - 'ec2api-tempest-plugin-1.2.1.tar.gz')}, - 'tempest-plugin-heat': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/heat-tempest-plugin/' - 'heat-tempest-plugin-1.2.0.tar.gz')}, - 'tempest-plugin-ironic': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/ironic-tempest-plugin/' - 'ironic-tempest-plugin-2.2.0.tar.gz')}, - 'tempest-plugin-keystone': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/keystone-tempest-plugin/' - 'keystone_tempest_plugin-0.7.0.tar.gz')}, - 'tempest-plugin-magnum': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/magnum-tempest-plugin/' - 'magnum_tempest_plugin-1.3.0.tar.gz')}, - 'tempest-plugin-manila': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/manila-tempest-plugin/' - 'manila-tempest-plugin-1.4.0.tar.gz')}, - 'tempest-plugin-mistral': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/mistral-tempest-plugin/' - 'mistral_tempest_tests-1.2.0.tar.gz')}, - 'tempest-plugin-monasca': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/monasca-tempest-plugin/' - 'monasca-tempest-plugin-2.2.1.tar.gz')}, - 'tempest-plugin-murano': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/murano-tempest-plugin/' - 'murano-tempest-plugin-2.2.0.tar.gz')}, - 'tempest-plugin-neutron': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/neutron-tempest-plugin/' - 'neutron-tempest-plugin-1.4.0.tar.gz')}, - 'tempest-plugin-patrole': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/patrole/' - 'patrole-0.12.0.tar.gz')}, - 'tempest-plugin-telemetry': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/telemetry-tempest-plugin/' - 'telemetry_tempest_plugin-1.3.0.tar.gz')}, - 'tempest-plugin-trove': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/trove-tempest-plugin/' - 'trove_tempest_plugin-1.2.0.tar.gz')}, - 'tempest-plugin-vitrage': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/vitrage-tempest-plugin/' - 'vitrage-tempest-plugin-5.3.0.tar.gz')}, - 'tempest-plugin-watcher': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/watcher-tempest-plugin/' - 'watcher-tempest-plugin-2.2.0.tar.gz')}, 'sahara-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/sahara/' @@ -688,10 +612,6 @@ SOURCES = { 'type': 'url', 'location': ('$tarballs_base/openstack/networking-sfc/' 'networking-sfc-${openstack_branch}.tar.gz')}, - 'tempest': { - 'type': 'url', - 'location': ('$tarballs_base/openstack/tempest/' - 'tempest-27.0.0.tar.gz')}, 'trove-base': { 'type': 'url', 'location': ('$tarballs_base/openstack/trove/' @@ -1002,7 +922,7 @@ USERS = { 'uid': 42479, 'gid': 42479, }, - 'tempest-user': { + 'tempest-user': { # unused user (tempest dropped) 'uid': 42480, 'gid': 42480, }, diff --git a/kolla/image/build.py b/kolla/image/build.py index 095d2ee6a..3e9d71620 100755 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -101,7 +101,6 @@ UNBUILDABLE_IMAGES = { 'source+aarch64': { "monasca-base", # pypi 'confluent-kafka' requires newer libfdkafka-dev # than distributions have - "tempest", # same reason as 'monasca-base' }, 'centos': { diff --git a/releasenotes/notes/remove-tempest-ffa7526963eae898.yaml b/releasenotes/notes/remove-tempest-ffa7526963eae898.yaml new file mode 100644 index 000000000..3a8e0bbef --- /dev/null +++ b/releasenotes/notes/remove-tempest-ffa7526963eae898.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + The ``Tempest`` project is not a service of OpenStack but its client. + Its images and support are removed since Xena cycle. diff --git a/roles/kolla-build-config/defaults/main.yml b/roles/kolla-build-config/defaults/main.yml index 81a2ec15c..9687f7bfd 100644 --- a/roles/kolla-build-config/defaults/main.yml +++ b/roles/kolla-build-config/defaults/main.yml @@ -93,25 +93,3 @@ kolla_build_sources: openstack/vitrage-dashboard: horizon-plugin-vitrage-dashboard openstack/watcher-dashboard: horizon-plugin-watcher-dashboard openstack/zun-ui: horizon-plugin-zun-ui - - # Tempest and its plugins - openstack/tempest: tempest - openstack/patrole: tempest-plugin-patrole - openstack/python-tempestconf: tempest-plugin-tempest-conf - openstack/barbican-tempest-plugin: tempest-plugin-barbican - openstack/blazar-tempest-plugin: tempest-plugin-blazar - openstack/cinder-tempest-plugin: tempest-plugin-cinder - openstack/ec2api-tempest-plugin: tempest-plugin-ec2api - openstack/heat-tempest-plugin: tempest-plugin-heat - openstack/ironic-tempest-plugin: tempest-plugin-ironic - openstack/keystone-tempest-plugin: tempest-plugin-keystone - openstack/magnum-tempest-plugin: tempest-plugin-magnum - openstack/manila-tempest-plugin: tempest-plugin-manila - openstack/mistral-tempest-plugin: tempest-plugin-mistral - openstack/monasca-tempest-plugin: tempest-plugin-monasca - openstack/murano-tempest-plugin: tempest-plugin-murano - openstack/neutron-tempest-plugin: tempest-plugin-neutron - openstack/telemetry-tempest-plugin: tempest-plugin-telemetry - openstack/trove-tempest-plugin: tempest-plugin-trove - openstack/vitrage-tempest-plugin: tempest-plugin-vitrage - openstack/watcher-tempest-plugin: tempest-plugin-watcher diff --git a/tools/version-check.py b/tools/version-check.py index 7c5cd28c4..d7dcdb2bf 100755 --- a/tools/version-check.py +++ b/tools/version-check.py @@ -47,26 +47,7 @@ SKIP_PROJECTS = { # NOTE(hrw): those projects we take as they are they may have just one old # release or no stable branch tarballs ALWAYS_USE_VERSION_PROJECTS = { - 'barbican_tempest_plugin', - 'blazar_tempest_plugin', - 'cinder-tempest-plugin', - 'ec2api-tempest-plugin', - 'heat-tempest-plugin', - 'ironic-tempest-plugin', - 'keystone_tempest_plugin', - 'magnum_tempest_plugin', - 'manila-tempest-plugin', - 'mistral_tempest_tests', - 'monasca-tempest-plugin', - 'murano-tempest-plugin', - 'neutron-tempest-plugin', - 'python-tempestconf', - 'telemetry_tempest_plugin', 'patrole', - 'trove_tempest_plugin', - 'vitrage-tempest-plugin', - 'watcher-tempest-plugin', - 'tempest', 'vmtp', } |