From f60c30cdc4968c7027d12aebccad7442d68fe46f Mon Sep 17 00:00:00 2001
From: Gage Hugo <gagehugo@gmail.com>
Date: Wed, 15 Jun 2022 11:15:39 -0500
Subject: [PATCH] Clean up older tempest distro releases

Currently tempest has several older linux distro Dockerfiles that
are either not maintained or used, this change removes them to
reduce the number of build targets we are doing to focus more
on what we actually use.

Change-Id: I01c1e2c39f76adebf05640c36af492121309e8d3
---
 ...OpenStack:Master-openSUSE_Leap_15.0.gpgkey | 21 ---------------
 tempest/Dockerfile.opensuse_15                | 21 ---------------
 tempest/Dockerfile.ubuntu_bionic              | 27 -------------------
 zuul.d/tempest.yaml                           |  6 -----
 4 files changed, 75 deletions(-)
 delete mode 100644 tempest/Cloud:OpenStack:Master-openSUSE_Leap_15.0.gpgkey
 delete mode 100644 tempest/Dockerfile.opensuse_15
 delete mode 100644 tempest/Dockerfile.ubuntu_bionic

diff --git a/tempest/Cloud:OpenStack:Master-openSUSE_Leap_15.0.gpgkey b/tempest/Cloud:OpenStack:Master-openSUSE_Leap_15.0.gpgkey
deleted file mode 100644
index 70c82615..00000000
--- a/tempest/Cloud:OpenStack:Master-openSUSE_Leap_15.0.gpgkey
+++ /dev/null
@@ -1,21 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.5 (GNU/Linux)
-
-mQENBFJUCd0BCADFph1AX+yZq5eKs8t3jRNyP8JDKghPQTTC6/rpPC2cLaSff4zB
-CNAh6G3Mqyv5TjRirqC841sMXCnFKCPJxAPrH/TLJonCsAFJNS7RHROw3ixL+puK
-fsaOrVlxd18NxnrOoQM4kb34WiRmCoLHi7yuuoD8QF6cIQKuAfYUWK6OmED07Tdz
-Exs2Pfnp9k9W1BbasVS/zBFq8e7qTTw86ZJDcd8CImsBzH/vQyrQRjnrNdCnPzjG
-sBnVoZJrnw/edAESykczR21/CB8a8nwPVFwV6UiWFp9Ngx4tY0b20E/KjB7zyt8C
-2dUsuOIlyQ3bHxIGAsRvPLMlRGGjmUEva77DABEBAAG0QENsb3VkOk9wZW5TdGFj
-ayBPQlMgUHJvamVjdCA8Q2xvdWQ6T3BlblN0YWNrQGJ1aWxkLm9wZW5zdXNlLm9y
-Zz6JATwEEwECACYFAluG5fgCGwMFCQ1RjBsGCwkIBwMCBBUCCAMEFgIDAQIeAQIX
-gAAKCRCJOpDa2F+TFvkoCACUjMX5XanZ246W57GDqQaBRBGlA/PLDionA0T/O7eV
-J0EquuHTrAZ3JmrJKu9wfvLyXG6r86wQ1FI0KuRA7EP9jsm+ayVevUx28a9/e7wj
-H5h2BJpP6gx3ukqfj92uJBuZHOvlcDYo9ThNEzDi7STvpHNOp/L3mR3bqi00Vb1u
-WQv//xPu5Hncq8Z1y+0Tk4BN8rIqheuKpvBzjgPHxt5ql+bhYGBM/NTPOaFwvwUQ
-w7/iB0jlnadM6frwvM2OxHAidDZLXpklEZrzVYC3NH6mr9JxRbFhZIGDPxsmgu9N
-zQ+8nxzmpprYiZ9qQfDn8Ke7epyROqTuUpA/LJFyagGQiEYEExECAAYFAlJUCd0A
-CgkQOzARt2udZSMmlACgirHQ0aJSPUcF2km6Gr4zMq2sRzIAoKZla9GZEL6Wl6aH
-cmd3/2i/nNmx
-=hpCE
------END PGP PUBLIC KEY BLOCK-----
diff --git a/tempest/Dockerfile.opensuse_15 b/tempest/Dockerfile.opensuse_15
deleted file mode 100644
index 8d0b88d8..00000000
--- a/tempest/Dockerfile.opensuse_15
+++ /dev/null
@@ -1,21 +0,0 @@
-ARG FROM=opensuse/leap:15.0
-FROM ${FROM}
-LABEL maintainer="cloud-devel@suse.com"
-
-ARG VERSION=Master
-ARG KEYFILE=Cloud:OpenStack:Master-openSUSE_Leap_15.0.gpgkey
-
-COPY ${KEYFILE} /tmp/
-RUN rpm --import /tmp/${KEYFILE}
-RUN rm /tmp/${KEYFILE}
-
-RUN set -ex ;\
-    zypper --non-interactive addrepo http://download.opensuse.org/repositories/Cloud:/OpenStack:/${VERSION}/openSUSE_Leap_15.0/ openstack-${VERSION} ;\
-    zypper --non-interactive refresh ;\
-    zypper --non-interactive up -y ;\
-    zypper --non-interactive install -y openstack-tempest \
-                                        python3-cinder-tempest-plugin \
-                                        python3-heat-tempest-plugin \
-                                        python3-keystone-tempest-plugin \
-                                        python3-neutron-tempest-plugin ;\
-    zypper --non-interactive clean -a
diff --git a/tempest/Dockerfile.ubuntu_bionic b/tempest/Dockerfile.ubuntu_bionic
deleted file mode 100644
index a13f4d26..00000000
--- a/tempest/Dockerfile.ubuntu_bionic
+++ /dev/null
@@ -1,27 +0,0 @@
-ARG FROM=ubuntu:18.04
-FROM ${FROM}
-
-RUN set -ex ;\
-    export DEBIAN_FRONTEND=noninteractive ;\
-    apt-get update ;\
-    apt-get upgrade -y ;\
-    apt-get install netbase -y ;\
-    apt-get install --no-install-recommends -y \
-        python3-dev \
-        build-essential \
-        python3-pip \
-        libssl-dev \
-        git ;\
-    pip3 install -U pip ;\
-    git clone https://git.openstack.org/openstack/tempest ;\
-    git clone https://git.openstack.org/openstack/cinder-tempest-plugin ;\
-    git clone https://git.openstack.org/openstack/heat-tempest-plugin ;\
-    git clone https://git.openstack.org/openstack/keystone-tempest-plugin ;\
-    git clone https://git.openstack.org/openstack/neutron-tempest-plugin ;\
-    pip3 install -U setuptools==58.0.0 ;\
-    pip3 install wheel ;\
-    pip3 install -e tempest/ \
-                    cinder-tempest-plugin/ \
-                    heat-tempest-plugin/ \
-                    keystone-tempest-plugin/ \
-                    neutron-tempest-plugin/ ;\
diff --git a/zuul.d/tempest.yaml b/zuul.d/tempest.yaml
index 7ef5f3f1..d5051e8c 100644
--- a/zuul.d/tempest.yaml
+++ b/zuul.d/tempest.yaml
@@ -34,12 +34,6 @@
     vars: &tempest_vars
       currentdate: "{{ now(utc=True,fmt='%Y%m%d') }}"
       docker_images:
-        - context: tempest
-          repository: openstackhelm/tempest
-          dockerfile: Dockerfile.ubuntu_bionic
-          tags:
-            - latest-ubuntu_bionic
-            - "ubuntu_bionic-{{ currentdate }}"
         - context: tempest
           repository: openstackhelm/tempest
           dockerfile: Dockerfile.ubuntu_focal