Merge pull request #78 from sclorg/remove_rhel7

Remove CentOS 7 and RHEL 7

Makefile

@@ -1,40 +1,40 @@
 .PHONY: test test-httpd test-php test-perl test-mariadb test-mysql test-nginx test-postgresql test-redis test-all test-nodejs test-ruby test-python
 
 test:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_varnish_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_varnish_*
 
 test-httpd:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_httpd_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_httpd_*
 
 test-mariadb:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_mariadb_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_mariadb_*
 
 test-mysql:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_mysql_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_mysql_*
 
 test-nginx:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_nginx_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_nginx_*
 
 test-postgresql:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_postgresql_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_postgresql_*
 
 test-redis:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_redis_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_redis_*
 
 test-php:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_php_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_php_*
 
 test-perl:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_perl_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_perl_*
 
 test-nodejs:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_nodejs_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_nodejs_*
 
 test-python:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_python_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_python_*
 
 test-ruby:
-	cd tests && PYTHONPATH=$(CURDIR) python3 -m pytest --color=yes --verbose -vv --showlocals test_ruby_*
+	cd tests && PYTHONPATH=$(CURDIR) python3.12 -m pytest --color=yes -s -rA --verbose -vv --showlocals test_ruby_*
 
 test-all: test test-php test-httpd test-mariadb test-mysql test-nginx test-postgresql test-redis test-perl test-python test-ruby test-nodejs
 

charts/centos/httpd-imagestreams/src/templates/imagestreams.yaml

@@ -86,41 +86,3 @@ spec:
       referencePolicy:
         type: Local
       name: 2.4-el8
-    - annotations:
-        description: >-
-          Build and serve static content via Apache HTTP Server (httpd) 2.4 on 
-          CentOS 7. For more information about using this builder image, 
-          including OpenShift considerations, see 
-          https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.
-        iconClass: icon-apache
-        openshift.io/display-name: Apache HTTP Server 2.4 (CentOS 7)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        sampleRepo: https://github.com/sclorg/httpd-ex.git
-        supports: httpd
-        tags: builder,httpd
-        version: "2.4"
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/httpd-24-centos7:latest
-      referencePolicy:
-        type: Local
-      name: 2.4-el7
-    - annotations:
-        description: >-
-          Build and serve static content via Apache HTTP Server (httpd) 2.4 on 
-          CentOS 7. For more information about using this builder image, 
-          including OpenShift considerations, see 
-          https://github.com/sclorg/httpd-container/blob/master/2.4/README.md.
-        iconClass: icon-apache
-        openshift.io/display-name: Apache HTTP Server 2.4
-        openshift.io/provider-display-name: Red Hat, Inc.
-        sampleRepo: https://github.com/sclorg/httpd-ex.git
-        supports: httpd
-        tags: builder,httpd,hidden
-        version: "2.4"
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/httpd-24-centos7:latest
-      referencePolicy:
-        type: Local
-      name: "2.4"

charts/centos/mariadb-imagestreams/src/templates/imagestreams.yaml

@@ -6,39 +6,6 @@ metadata:
     openshift.io/display-name: MariaDB
 spec:
   tags:
-    - name: latest
-      annotations:
-        openshift.io/display-name: MariaDB (Latest)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Provides a MariaDB database on CentOS. For more information about using 
-          this database image, including OpenShift considerations, see 
-          https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.
-
-          WARNING: By selecting this tag, your application will automatically update to use the latest version of MariaDB available on OpenShift, including major version updates.
-        iconClass: icon-mariadb
-        tags: database,mariadb
-      from:
-        kind: ImageStreamTag
-        name: 10.5-el7
-      referencePolicy:
-        type: Local
-    - name: 10.5-el7
-      annotations:
-        openshift.io/display-name: MariaDB 10.5 (CentOS 7)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Provides a MariaDB 10.5 database on CentOS 7. For more information about 
-          using this database image, including OpenShift considerations, see 
-          https://github.com/sclorg/mariadb-container/tree/master/10.5/README.md.
-        iconClass: icon-mariadb
-        tags: database,mariadb
-        version: "10.5"
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/mariadb-105-centos7:latest
-      referencePolicy:
-        type: Local
     - name: 10.3-el8
       annotations:
         openshift.io/display-name: MariaDB 10.3 (CentOS 8)
@@ -55,35 +22,3 @@ spec:
         name: docker.io/centos/mariadb-103-centos8:latest
       referencePolicy:
         type: Local
-    - name: 10.3-el7
-      annotations:
-        openshift.io/display-name: MariaDB 10.3 (CentOS 7)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Provides a MariaDB 10.3 database on CentOS 7. For more information about 
-          using this database image, including OpenShift considerations, see 
-          https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.
-        iconClass: icon-mariadb
-        tags: database,mariadb
-        version: "10.3"
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/mariadb-103-centos7:latest
-      referencePolicy:
-        type: Local
-    - name: "10.3"
-      annotations:
-        openshift.io/display-name: MariaDB 10.3
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Provides a MariaDB 10.3 database on CentOS 7. For more information about 
-          using this database image, including OpenShift considerations, see 
-          https://github.com/sclorg/mariadb-container/tree/master/10.3/README.md.
-        iconClass: icon-mariadb
-        tags: database,mariadb,hidden
-        version: "10.3"
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/mariadb-103-centos7:latest
-      referencePolicy:
-        type: Local

charts/centos/mysql-imagestreams/src/templates/imagestreams.yaml

@@ -39,35 +39,3 @@ spec:
         name: docker.io/centos/mysql-80-centos8:latest
       referencePolicy:
         type: Local
-    - name: 8.0-el7
-      annotations:
-        openshift.io/display-name: MySQL 8.0 (CentOS 7)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Provides a MySQL 8.0 database on CentOS 7. For more information about 
-          using this database image, including OpenShift considerations, see 
-          https://github.com/sclorg/mysql-container/blob/master/README.md.
-        iconClass: icon-mysql-database
-        tags: mysql
-        version: "8.0"
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/mysql-80-centos7:latest
-      referencePolicy:
-        type: Local
-    - name: "8.0"
-      annotations:
-        openshift.io/display-name: MySQL 8.0
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Provides a MySQL 8.0 database on CentOS 7. For more information about 
-          using this database image, including OpenShift considerations, see 
-          https://github.com/sclorg/mysql-container/blob/master/README.md.
-        iconClass: icon-mysql-database
-        tags: mysql,hidden
-        version: "8.0"
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/mysql-80-centos7:latest
-      referencePolicy:
-        type: Local

charts/centos/nginx-imagestreams/src/templates/imagestreams.yaml

@@ -66,22 +66,3 @@ spec:
       referencePolicy:
         type: Local
       name: 1.20-ubi8
-    - annotations:
-        description: >-
-          Build and serve static content via Nginx HTTP server and a reverse 
-          proxy (nginx) on RHEL 7. For more information about using this builder 
-          image, including OpenShift considerations, see 
-          https://github.com/sclorg/nginx-container/blob/master/1.20/README.md.
-        iconClass: icon-nginx
-        openshift.io/display-name: Nginx HTTP server and a reverse proxy 1.20 (UBI 7)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        sampleRepo: https://github.com/sclorg/nginx-ex.git
-        supports: nginx
-        tags: builder,nginx
-        version: "1.20"
-      from:
-        kind: DockerImage
-        name: registry.access.redhat.com/ubi7/nginx-120:latest
-      referencePolicy:
-        type: Local
-      name: 1.20-ubi7

charts/centos/nodejs-imagestreams/src/templates/imagestreams.yaml

@@ -132,20 +132,3 @@ spec:
         name: registry.access.redhat.com/ubi8/nodejs-14-minimal:latest
       referencePolicy:
         type: Local
-    - name: 14-ubi7
-      annotations:
-        openshift.io/display-name: Node.js 14 (UBI 7)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Build and run Node.js 14 applications on UBI 7. For more information 
-          about using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-nodejs-container/blob/master/14/README.md.
-        iconClass: icon-nodejs
-        tags: builder,nodejs,hidden
-        version: "14"
-        sampleRepo: https://github.com/sclorg/nodejs-ex.git
-      from:
-        kind: DockerImage
-        name: registry.access.redhat.com/ubi7/nodejs-14:latest
-      referencePolicy:
-        type: Local

charts/centos/perl-imagestreams/src/templates/imagestreams.yaml

@@ -80,42 +80,6 @@ spec:
         name: registry.access.redhat.com/ubi8/perl-530:latest
       referencePolicy:
         type: Local
-    - name: 5.30-el7
-      annotations:
-        openshift.io/display-name: Perl 5.30 (CentOS 7)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Build and run Perl 5.30 applications on CentOS 7. For more information 
-          about using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.
-        iconClass: icon-perl
-        tags: builder,perl
-        supports: perl:5.30,perl
-        version: "5.30"
-        sampleRepo: https://github.com/sclorg/dancer-ex.git
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/perl-530-centos7:latest
-      referencePolicy:
-        type: Local
-    - name: "5.30"
-      annotations:
-        openshift.io/display-name: Perl 5.30
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Build and run Perl 5.30 applications on CentOS 7. For more information 
-          about using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-perl-container/blob/master/5.30/README.md.
-        iconClass: icon-perl
-        tags: builder,perl,hidden
-        supports: perl:5.30,perl
-        version: "5.30"
-        sampleRepo: https://github.com/sclorg/dancer-ex.git
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/perl-530-centos7:latest
-      referencePolicy:
-        type: Local
     - name: 5.26-ubi8
       annotations:
         openshift.io/display-name: Perl 5.26 (UBI 8)

charts/centos/php-imagestreams/src/templates/imagestreams.yaml

@@ -81,39 +81,3 @@ spec:
         name: registry.access.redhat.com/ubi8/php-74:latest
       referencePolicy:
         type: Local
-    - name: 7.3-ubi7
-      annotations:
-        openshift.io/display-name: PHP 7.3 (UBI 7)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Build and run PHP 7.3 applications on UBI 7. For more information about
-           using this builder image, including OpenShift considerations, see 
-           https://github.com/sclorg/s2i-php-container/blob/master/7.3/README.md.
-        iconClass: icon-php
-        tags: builder,php
-        supports: php:7.3,php
-        version: "7.3"
-        sampleRepo: https://github.com/sclorg/cakephp-ex.git
-      from:
-        kind: DockerImage
-        name: registry.access.redhat.com/ubi7/php-73:latest
-      referencePolicy:
-        type: Local
-    - name: "7.3"
-      annotations:
-        openshift.io/display-name: PHP 7.3
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Build and run PHP 7.3 applications on CentOS 7. For more information 
-          about using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-php-container/blob/master/7.3/README.md.
-        iconClass: icon-php
-        tags: builder,php,hidden
-        supports: php:7.3,php
-        version: "7.3"
-        sampleRepo: https://github.com/sclorg/cakephp-ex.git
-      from:
-        kind: DockerImage
-        name: quay.io/centos7/php-73-centos7:latest
-      referencePolicy:
-        type: Local

charts/centos/python-imagestreams/src/templates/imagestreams.yaml

@@ -81,24 +81,6 @@ spec:
         name: registry.access.redhat.com/ubi8/python-38:latest
       referencePolicy:
         type: Local
-    - name: 3.8-ubi7
-      annotations:
-        openshift.io/display-name: Python 3.8 (UBI 7)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Build and run Python 3.8 applications on UBI 7. For more information 
-          about using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-python-container/blob/master/3.8/README.md.
-        iconClass: icon-python
-        tags: builder,python
-        supports: python:3.8,python
-        version: "3.8"
-        sampleRepo: https://github.com/sclorg/django-ex.git
-      from:
-        kind: DockerImage
-        name: registry.access.redhat.com/ubi7/python-38:latest
-      referencePolicy:
-        type: Local
     - name: 3.6-ubi8
       annotations:
         openshift.io/display-name: Python 3.6 (UBI 8)
@@ -117,21 +99,3 @@ spec:
         name: registry.access.redhat.com/ubi8/python-36:latest
       referencePolicy:
         type: Local
-    - name: 2.7-ubi8
-      annotations:
-        openshift.io/display-name: Python 2.7 (UBI 8)
-        openshift.io/provider-display-name: Red Hat, Inc.
-        description: >-
-          Build and run Python 2.7 applications on UBI 8. For more information 
-          about using this builder image, including OpenShift considerations, see 
-          https://github.com/sclorg/s2i-python-container/blob/master/2.7/README.md.
-        iconClass: icon-python
-        tags: builder,python
-        supports: python:2.7,python
-        version: "2.7"
-        sampleRepo: https://github.com/sclorg/django-ex.git
-      from:
-        kind: DockerImage
-        name: registry.access.redhat.com/ubi8/python-27:latest
-      referencePolicy:
-        type: Local