From e077cfa7ff45a4005680cb8c28c532ff621cc8d0 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Tue, 30 Jul 2024 16:51:45 +0200 Subject: [PATCH 1/2] Remove CentOS 7 and RHEL 7 Signed-off-by: Petr "Stone" Hracek --- Makefile | 24 ++-- .../src/templates/imagestreams.yaml | 38 ------- .../src/templates/imagestreams.yaml | 65 ----------- .../src/templates/imagestreams.yaml | 32 ------ .../src/templates/imagestreams.yaml | 19 ---- .../src/templates/imagestreams.yaml | 17 --- .../src/templates/imagestreams.yaml | 36 ------ .../src/templates/imagestreams.yaml | 36 ------ .../src/templates/imagestreams.yaml | 18 --- .../src/templates/imagestreams.yaml | 8 +- .../src/templates/imagestreams.yaml | 18 --- charts/centos/varnish-imagestreams/OWNERS | 9 -- .../varnish-imagestreams/src/Chart.yaml | 13 --- .../src/templates/imagestreams.yaml | 106 ----------------- .../redhat/httpd-imagestreams/src/Chart.yaml | 4 +- .../src/templates/imagestreams.yaml | 38 ------- .../mariadb-imagestreams/src/Chart.yaml | 4 +- .../src/templates/imagestreams.yaml | 48 -------- .../redhat/mysql-imagestreams/src/Chart.yaml | 4 +- .../src/templates/imagestreams.yaml | 32 ------ .../redhat/nginx-imagestreams/src/Chart.yaml | 4 +- .../src/templates/imagestreams.yaml | 19 ---- .../redhat/nodejs-imagestreams/src/Chart.yaml | 4 +- .../src/templates/nodejs-imagestream.yaml | 15 --- .../redhat/perl-imagestreams/src/Chart.yaml | 4 +- .../src/templates/perl-imagestreams.yaml | 32 ------ charts/redhat/php-imagestreams/src/Chart.yaml | 4 +- .../src/templates/php-imagestream.yaml | 33 ------ .../postgresql-imagestreams/src/Chart.yaml | 4 +- .../src/templates/imagestreams.yaml | 102 ----------------- .../redhat/python-imagestreams/src/Chart.yaml | 4 +- .../src/templates/python-imagestream.yaml | 48 -------- .../redhat/redis-imagestreams/src/Chart.yaml | 4 +- .../src/templates/imagestreams.yaml | 16 --- .../redhat/ruby-imagestreams/src/Chart.yaml | 4 +- .../src/templates/ruby-imagestream.yaml | 16 --- charts/redhat/varnish-imagestreams/OWNERS | 9 -- .../varnish-imagestreams/src/Chart.yaml | 13 --- .../src/templates/imagestreams.yaml | 107 ------------------ httpd-imagestreams-0.0.2.tgz | Bin 0 -> 982 bytes mariadb-imagestreams-0.0.2.tgz | Bin 0 -> 944 bytes mysql-imagestreams-0.0.2.tgz | Bin 0 -> 907 bytes nginx-imagestreams-0.0.3.tgz | Bin 0 -> 982 bytes nodejs-imagestreams-0.0.3.tgz | Bin 0 -> 1076 bytes nodejs-imagestreams-0.0.4.tgz | Bin 0 -> 1076 bytes perl-imagestreams-0.0.2.tgz | Bin 0 -> 968 bytes php-imagestreams-0.0.2.tgz | Bin 0 -> 976 bytes postgresql-imagestreams-0.0.2.tgz | Bin 0 -> 1540 bytes python-imagestreams-0.0.2.tgz | Bin 0 -> 1026 bytes redis-imagestreams-0.0.2.tgz | Bin 0 -> 877 bytes ruby-imagestreams-0.0.2.tgz | Bin 0 -> 1007 bytes tests/test_httpd_imagestreams.py | 15 +-- tests/test_httpd_template.py | 4 +- tests/test_mariadb_imagestreams.py | 15 +-- tests/test_mariadb_template.py | 4 +- tests/test_mysql_imagestreams.py | 12 +- tests/test_mysql_template.py | 4 +- tests/test_nginx_imagestreams.py | 12 +- tests/test_nginx_template.py | 4 +- tests/test_nodejs_imagestreams.py | 10 +- tests/test_perl_dancer_app.py | 8 +- tests/test_perl_dancer_mysql_template.py | 8 +- tests/test_perl_imagestreams.py | 12 +- tests/test_php_cakephp_application.py | 4 +- tests/test_php_imagestreams.py | 14 +-- tests/test_postgresql_imagestreams.py | 14 +-- tests/test_postgresql_template.py | 4 +- tests/test_python_django_app.py | 6 +- tests/test_python_django_psql_persistent.py | 12 +- tests/test_python_imagestreams.py | 15 +-- tests/test_redis_imagestreams.py | 13 +-- tests/test_redis_template.py | 6 +- tests/test_ruby_imagestreams.py | 12 +- tests/test_ruby_rails_application.py | 4 +- tests/test_varnish_imagestreams.py | 59 ---------- varnish-imagestreams-0.0.1.tgz | Bin 1028 -> 0 bytes 76 files changed, 117 insertions(+), 1165 deletions(-) delete mode 100644 charts/centos/varnish-imagestreams/OWNERS delete mode 100644 charts/centos/varnish-imagestreams/src/Chart.yaml delete mode 100644 charts/centos/varnish-imagestreams/src/templates/imagestreams.yaml delete mode 100644 charts/redhat/varnish-imagestreams/OWNERS delete mode 100644 charts/redhat/varnish-imagestreams/src/Chart.yaml delete mode 100644 charts/redhat/varnish-imagestreams/src/templates/imagestreams.yaml create mode 100644 httpd-imagestreams-0.0.2.tgz create mode 100644 mariadb-imagestreams-0.0.2.tgz create mode 100644 mysql-imagestreams-0.0.2.tgz create mode 100644 nginx-imagestreams-0.0.3.tgz create mode 100644 nodejs-imagestreams-0.0.3.tgz create mode 100644 nodejs-imagestreams-0.0.4.tgz create mode 100644 perl-imagestreams-0.0.2.tgz create mode 100644 php-imagestreams-0.0.2.tgz create mode 100644 postgresql-imagestreams-0.0.2.tgz create mode 100644 python-imagestreams-0.0.2.tgz create mode 100644 redis-imagestreams-0.0.2.tgz create mode 100644 ruby-imagestreams-0.0.2.tgz delete mode 100644 tests/test_varnish_imagestreams.py delete mode 100644 varnish-imagestreams-0.0.1.tgz diff --git a/Makefile b/Makefile index 02b4df2..2936625 100644 --- a/Makefile +++ b/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 diff --git a/charts/centos/httpd-imagestreams/src/templates/imagestreams.yaml b/charts/centos/httpd-imagestreams/src/templates/imagestreams.yaml index 959417a..f9442c8 100644 --- a/charts/centos/httpd-imagestreams/src/templates/imagestreams.yaml +++ b/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" diff --git a/charts/centos/mariadb-imagestreams/src/templates/imagestreams.yaml b/charts/centos/mariadb-imagestreams/src/templates/imagestreams.yaml index a69cfd2..176b890 100644 --- a/charts/centos/mariadb-imagestreams/src/templates/imagestreams.yaml +++ b/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 diff --git a/charts/centos/mysql-imagestreams/src/templates/imagestreams.yaml b/charts/centos/mysql-imagestreams/src/templates/imagestreams.yaml index 1f31fa7..c132c5c 100644 --- a/charts/centos/mysql-imagestreams/src/templates/imagestreams.yaml +++ b/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 diff --git a/charts/centos/nginx-imagestreams/src/templates/imagestreams.yaml b/charts/centos/nginx-imagestreams/src/templates/imagestreams.yaml index d5a275f..2b8b322 100644 --- a/charts/centos/nginx-imagestreams/src/templates/imagestreams.yaml +++ b/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 diff --git a/charts/centos/nodejs-imagestreams/src/templates/imagestreams.yaml b/charts/centos/nodejs-imagestreams/src/templates/imagestreams.yaml index 2f64482..691c118 100644 --- a/charts/centos/nodejs-imagestreams/src/templates/imagestreams.yaml +++ b/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 diff --git a/charts/centos/perl-imagestreams/src/templates/imagestreams.yaml b/charts/centos/perl-imagestreams/src/templates/imagestreams.yaml index 58c6635..403d4de 100644 --- a/charts/centos/perl-imagestreams/src/templates/imagestreams.yaml +++ b/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) diff --git a/charts/centos/php-imagestreams/src/templates/imagestreams.yaml b/charts/centos/php-imagestreams/src/templates/imagestreams.yaml index 91ccfb2..7b631d4 100644 --- a/charts/centos/php-imagestreams/src/templates/imagestreams.yaml +++ b/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 diff --git a/charts/centos/python-imagestreams/src/templates/imagestreams.yaml b/charts/centos/python-imagestreams/src/templates/imagestreams.yaml index 13a4884..7fc4417 100644 --- a/charts/centos/python-imagestreams/src/templates/imagestreams.yaml +++ b/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) diff --git a/charts/centos/redis-imagestreams/src/templates/imagestreams.yaml b/charts/centos/redis-imagestreams/src/templates/imagestreams.yaml index 9364742..1507411 100644 --- a/charts/centos/redis-imagestreams/src/templates/imagestreams.yaml +++ b/charts/centos/redis-imagestreams/src/templates/imagestreams.yaml @@ -21,13 +21,13 @@ spec: tags: redis from: kind: ImageStreamTag - name: 6-el7 + name: 6-el8 referencePolicy: type: Local name: latest - annotations: description: >- - Provides a Redis 6 database on CentOS 7. For more information about + Provides a Redis 6 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md. iconClass: icon-redis @@ -37,7 +37,7 @@ spec: version: "6" from: kind: DockerImage - name: quay.io/centos7/redis-6-centos7:latest + name: quay.io/sclorg/redis-6-c8s:latest referencePolicy: type: Local - name: 6-el7 + name: 6-el8 diff --git a/charts/centos/ruby-imagestreams/src/templates/imagestreams.yaml b/charts/centos/ruby-imagestreams/src/templates/imagestreams.yaml index 2720d75..f12c49f 100644 --- a/charts/centos/ruby-imagestreams/src/templates/imagestreams.yaml +++ b/charts/centos/ruby-imagestreams/src/templates/imagestreams.yaml @@ -63,24 +63,6 @@ spec: name: registry.access.redhat.com/ubi8/ruby-30:latest referencePolicy: type: Local - - name: 3.0-ubi7 - annotations: - openshift.io/display-name: Ruby 3.0 (UBI 7) - openshift.io/provider-display-name: Red Hat, Inc. - description: >- - Build and run Ruby 3.0 applications on UBI 7. For more information - about using this builder image, including OpenShift considerations, see - https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md. - iconClass: icon-ruby - tags: builder,ruby - supports: ruby:3.0,ruby - version: "3.0" - sampleRepo: https://github.com/sclorg/ruby-ex.git - from: - kind: DockerImage - name: registry.access.redhat.com/ubi7/ruby-30:latest - referencePolicy: - type: Local - name: 2.5-ubi8 annotations: openshift.io/display-name: Ruby 2.5 (UBI 8) diff --git a/charts/centos/varnish-imagestreams/OWNERS b/charts/centos/varnish-imagestreams/OWNERS deleted file mode 100644 index ebf0ede..0000000 --- a/charts/centos/varnish-imagestreams/OWNERS +++ /dev/null @@ -1,9 +0,0 @@ -chart: - name: varnish-imagestreams - description: This is the CentOS Varnish imagestream chart -publicPgpKey: null -users: - - githubUsername: phracek -vendor: - label: centos - name: Cent OS diff --git a/charts/centos/varnish-imagestreams/src/Chart.yaml b/charts/centos/varnish-imagestreams/src/Chart.yaml deleted file mode 100644 index 583e5cb..0000000 --- a/charts/centos/varnish-imagestreams/src/Chart.yaml +++ /dev/null @@ -1,13 +0,0 @@ -description: |- - This content is expermental, do not use it in production. CentOS Varnish Cache HTTP reverse proxy imagestreams. - For more information about Varnish container see https://github.com/sclorg/varnish-container/. -annotations: - charts.openshift.io/name: CentOS Varnish Cache HTTP reverse proxy imagestreams (experimental) -apiVersion: v2 -appVersion: 0.0.1 -kubeVersion: '>=1.20.0' -name: varnish-imagestreams -tags: builder,varnish -sources: - - https://github.com/sclorg/helm-charts -version: 0.0.1 diff --git a/charts/centos/varnish-imagestreams/src/templates/imagestreams.yaml b/charts/centos/varnish-imagestreams/src/templates/imagestreams.yaml deleted file mode 100644 index 8a8c368..0000000 --- a/charts/centos/varnish-imagestreams/src/templates/imagestreams.yaml +++ /dev/null @@ -1,106 +0,0 @@ -apiVersion: image.openshift.io/v1 -kind: ImageStream -metadata: - annotations: - openshift.io/display-name: Varnish Cache HTTP reverse proxy (varnish) - name: varnish -spec: - tags: - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on CentOS 8. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/5/README.md. - - WARNING: By selecting this tag, your application will automatically - update to use the latest version of Varnish available on OpenShift, - including major version updates. - iconClass: icon-varnish - openshift.io/display-name: Varnish Cache HTTP reverse proxy (Latest) - openshift.io/provider-display-name: Red Hat, Inc. - sampleRepo: https://github.com/sclorg/varnish-container.git - supports: varnish - tags: builder,varnish - from: - kind: ImageStreamTag - name: 6-el8 - referencePolicy: - type: Local - name: latest - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on CentOS 7. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/6/README.md. - iconClass: icon-varnish - openshift.io/display-name: Varnish 6 Cache HTTP reverse proxy - openshift.io/provider-display-name: Red Hat, Inc. - sampleRepo: https://github.com/sclorg/varnish-container.git - supports: varnish - tags: builder,varnish - version: "6" - from: - kind: DockerImage - name: quay.io/centos7/varnish-6-centos7:latest - referencePolicy: - type: Local - name: "6" - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on CentOS 8. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/6/README.md. - iconClass: icon-varnish - openshift.io/display-name: Varnish 6 Cache HTTP reverse proxy (CentOS 8) - openshift.io/provider-display-name: Red Hat, Inc. - sampleRepo: https://github.com/sclorg/varnish-container.git - supports: varnish - tags: builder,varnish - version: "6" - from: - kind: DockerImage - name: docker.io/centos/varnish-6-centos8:latest - referencePolicy: - type: Local - name: 6-el8 - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on CentOS 7. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/6/README.md. - iconClass: icon-varnish - openshift.io/display-name: Varnish 6 Cache HTTP reverse proxy (CentOS 7) - openshift.io/provider-display-name: Red Hat, Inc. - sampleRepo: https://github.com/sclorg/varnish-container.git - supports: varnish - tags: builder,varnish - version: "6" - from: - kind: DockerImage - name: quay.io/centos7/varnish-6-centos7:latest - referencePolicy: - type: Local - name: 6-el7 - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on CentOS 8. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/5/README.md. - iconClass: icon-varnish - openshift.io/display-name: Varnish 5 Cache HTTP reverse proxy (CentOS 8) - openshift.io/provider-display-name: Red Hat, Inc. - sampleRepo: https://github.com/sclorg/varnish-container.git - supports: varnish - tags: builder,varnish - version: "5" - from: - kind: DockerImage - name: docker.io/centos/varnish-5-centos8:latest - referencePolicy: - type: Local - name: 5-el8 diff --git a/charts/redhat/httpd-imagestreams/src/Chart.yaml b/charts/redhat/httpd-imagestreams/src/Chart.yaml index b516b29..2d86673 100644 --- a/charts/redhat/httpd-imagestreams/src/Chart.yaml +++ b/charts/redhat/httpd-imagestreams/src/Chart.yaml @@ -4,10 +4,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat Apache HTTP Server imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: httpd-imagestreams tags: builder,httpd sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/httpd-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/httpd-imagestreams/src/templates/imagestreams.yaml index f24b6e6..224ed75 100644 --- a/charts/redhat/httpd-imagestreams/src/templates/imagestreams.yaml +++ b/charts/redhat/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 - RHEL 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 (RHEL 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: registry.redhat.io/rhscl/httpd-24-rhel7 - referencePolicy: - type: Local - name: 2.4-el7 - - annotations: - description: >- - Build and serve static content via Apache HTTP Server (httpd) 2.4 on - RHEL 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: registry.redhat.io/rhscl/httpd-24-rhel7 - referencePolicy: - type: Local - name: '2.4' diff --git a/charts/redhat/mariadb-imagestreams/src/Chart.yaml b/charts/redhat/mariadb-imagestreams/src/Chart.yaml index c5a4e9a..451786f 100644 --- a/charts/redhat/mariadb-imagestreams/src/Chart.yaml +++ b/charts/redhat/mariadb-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat MariaDB database service imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: mariadb-imagestreams tags: database,mariadb sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/mariadb-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/mariadb-imagestreams/src/templates/imagestreams.yaml index b5d79b5..ab98fbe 100644 --- a/charts/redhat/mariadb-imagestreams/src/templates/imagestreams.yaml +++ b/charts/redhat/mariadb-imagestreams/src/templates/imagestreams.yaml @@ -42,54 +42,6 @@ spec: name: 'registry.redhat.io/rhel8/mariadb-103:latest' referencePolicy: type: Local - - name: 10.3-el7 - annotations: - openshift.io/display-name: MariaDB 10.3 (RHEL 7) - openshift.io/provider-display-name: 'Red Hat, Inc.' - description: >- - Provides a MariaDB 10.3 database on RHEL 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: 'registry.redhat.io/rhscl/mariadb-103-rhel7: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 RHEL 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: 'registry.redhat.io/rhscl/mariadb-103-rhel7:latest' - referencePolicy: - type: Local - - name: 10.5-el7 - annotations: - openshift.io/display-name: MariaDB 10.5 (RHEL 7) - openshift.io/provider-display-name: 'Red Hat, Inc.' - description: >- - Provides a MariaDB 10.5 database on RHEL 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: 'registry.redhat.io/rhscl/mariadb-105-rhel7:latest' - referencePolicy: - type: Local - name: 10.5-el8 annotations: openshift.io/display-name: MariaDB 10.5 (RHEL 8) diff --git a/charts/redhat/mysql-imagestreams/src/Chart.yaml b/charts/redhat/mysql-imagestreams/src/Chart.yaml index 2e0122d..0f5e3a8 100644 --- a/charts/redhat/mysql-imagestreams/src/Chart.yaml +++ b/charts/redhat/mysql-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat MySQL database service imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: mysql-imagestreams tags: database,mysql sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/mysql-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/mysql-imagestreams/src/templates/imagestreams.yaml index 8610357..d7d216f 100644 --- a/charts/redhat/mysql-imagestreams/src/templates/imagestreams.yaml +++ b/charts/redhat/mysql-imagestreams/src/templates/imagestreams.yaml @@ -58,35 +58,3 @@ spec: name: 'registry.redhat.io/rhel8/mysql-80:latest' referencePolicy: type: Local - - name: 8.0-el7 - annotations: - openshift.io/display-name: MySQL 8.0 (RHEL 7) - openshift.io/provider-display-name: 'Red Hat, Inc.' - description: >- - Provides a MySQL 8.0 database on RHEL 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: 'registry.redhat.io/rhscl/mysql-80-rhel7: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 RHEL 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: 'registry.redhat.io/rhscl/mysql-80-rhel7:latest' - referencePolicy: - type: Local diff --git a/charts/redhat/nginx-imagestreams/src/Chart.yaml b/charts/redhat/nginx-imagestreams/src/Chart.yaml index c8ff409..f997278 100644 --- a/charts/redhat/nginx-imagestreams/src/Chart.yaml +++ b/charts/redhat/nginx-imagestreams/src/Chart.yaml @@ -4,10 +4,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat Nginx HTTP server and a reverse proxy (nginx) (experimental) apiVersion: v2 -appVersion: 0.0.2 +appVersion: 0.0.3 kubeVersion: '>=1.20.0' name: nginx-imagestreams tags: builder,nginx sources: - https://github.com/sclorg/helm-charts -version: 0.0.2 +version: 0.0.3 diff --git a/charts/redhat/nginx-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/nginx-imagestreams/src/templates/imagestreams.yaml index 56c731c..1959213 100644 --- a/charts/redhat/nginx-imagestreams/src/templates/imagestreams.yaml +++ b/charts/redhat/nginx-imagestreams/src/templates/imagestreams.yaml @@ -105,22 +105,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.redhat.io/ubi7/nginx-120:latest' - referencePolicy: - type: Local - name: 1.20-ubi7 diff --git a/charts/redhat/nodejs-imagestreams/src/Chart.yaml b/charts/redhat/nodejs-imagestreams/src/Chart.yaml index b377584..fb69b9c 100644 --- a/charts/redhat/nodejs-imagestreams/src/Chart.yaml +++ b/charts/redhat/nodejs-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat NodeJS applications on UBI (experimental) apiVersion: v2 -appVersion: 0.0.3 +appVersion: 0.0.4 kubeVersion: '>=1.20.0' name: nodejs-imagestreams tags: builder,nodejs sources: - https://github.com/sclorg/helm-charts -version: 0.0.3 +version: 0.0.4 diff --git a/charts/redhat/nodejs-imagestreams/src/templates/nodejs-imagestream.yaml b/charts/redhat/nodejs-imagestreams/src/templates/nodejs-imagestream.yaml index edd83c8..25915ce 100644 --- a/charts/redhat/nodejs-imagestreams/src/templates/nodejs-imagestream.yaml +++ b/charts/redhat/nodejs-imagestreams/src/templates/nodejs-imagestream.yaml @@ -148,18 +148,3 @@ spec: name: registry.redhat.io/ubi8/nodejs-18-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.redhat.io/ubi7/nodejs-14:latest - referencePolicy: - type: Local diff --git a/charts/redhat/perl-imagestreams/src/Chart.yaml b/charts/redhat/perl-imagestreams/src/Chart.yaml index 1352ee3..2e4cf73 100644 --- a/charts/redhat/perl-imagestreams/src/Chart.yaml +++ b/charts/redhat/perl-imagestreams/src/Chart.yaml @@ -7,10 +7,10 @@ annotations: charts.openshift.io/provider: Red Hat charts.openshift.io/providerType: redhat apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: perl-imagestreams tags: builder,perl sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/perl-imagestreams/src/templates/perl-imagestreams.yaml b/charts/redhat/perl-imagestreams/src/templates/perl-imagestreams.yaml index 6f4f989..e43e5ae 100644 --- a/charts/redhat/perl-imagestreams/src/templates/perl-imagestreams.yaml +++ b/charts/redhat/perl-imagestreams/src/templates/perl-imagestreams.yaml @@ -56,38 +56,6 @@ spec: name: registry.redhat.io/ubi8/perl-532:latest referencePolicy: type: Local - - name: 5.30-el7 - annotations: - openshift.io/display-name: Perl 5.30 (RHEL 7) - openshift.io/provider-display-name: Red Hat, Inc. - description: Build and run Perl 5.30 applications on RHEL 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: registry.redhat.io/rhscl/perl-530-rhel7: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 RHEL 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: registry.redhat.io/rhscl/perl-530-rhel7:latest - referencePolicy: - type: Local - name: 5.26-ubi8 annotations: openshift.io/display-name: Perl 5.26 (UBI 8) diff --git a/charts/redhat/php-imagestreams/src/Chart.yaml b/charts/redhat/php-imagestreams/src/Chart.yaml index b0313e6..de86af8 100644 --- a/charts/redhat/php-imagestreams/src/Chart.yaml +++ b/charts/redhat/php-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat PHP applications on UBI (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: php-imagestreams tags: builder,php sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/php-imagestreams/src/templates/php-imagestream.yaml b/charts/redhat/php-imagestreams/src/templates/php-imagestream.yaml index bd98237..993849a 100644 --- a/charts/redhat/php-imagestreams/src/templates/php-imagestream.yaml +++ b/charts/redhat/php-imagestreams/src/templates/php-imagestream.yaml @@ -88,36 +88,3 @@ spec: name: registry.redhat.io/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.redhat.io/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 RHEL 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: registry.redhat.io/rhscl/php-73-rhel7:latest - referencePolicy: - type: Local - diff --git a/charts/redhat/postgresql-imagestreams/src/Chart.yaml b/charts/redhat/postgresql-imagestreams/src/Chart.yaml index 85c3371..e0e4c98 100644 --- a/charts/redhat/postgresql-imagestreams/src/Chart.yaml +++ b/charts/redhat/postgresql-imagestreams/src/Chart.yaml @@ -4,10 +4,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat PostgreSQL database service imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: postgresql-imagestreams tags: database,postgresql sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/postgresql-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/postgresql-imagestreams/src/templates/imagestreams.yaml index 252121d..bf51202 100644 --- a/charts/redhat/postgresql-imagestreams/src/templates/imagestreams.yaml +++ b/charts/redhat/postgresql-imagestreams/src/templates/imagestreams.yaml @@ -60,23 +60,6 @@ spec: name: 'registry.redhat.io/rhel8/postgresql-13:latest' referencePolicy: type: Local - - name: 13-el7 - annotations: - openshift.io/display-name: PostgreSQL 13 (RHEL 7) - openshift.io/provider-display-name: 'Red Hat, Inc.' - description: >- - Provides a PostgreSQL 13 database on RHEL 7. For more information - about using this database image, including OpenShift considerations, - see - https://github.com/sclorg/postgresql-container/blob/master/README.md. - iconClass: icon-postgresql - tags: 'database,postgresql' - version: '13' - from: - kind: DockerImage - name: 'registry.redhat.io/rhscl/postgresql-13-rhel7:latest' - referencePolicy: - type: Local - name: 12-el8 annotations: openshift.io/display-name: PostgreSQL 12 (RHEL 8) @@ -94,88 +77,3 @@ spec: name: 'registry.redhat.io/rhel8/postgresql-12:latest' referencePolicy: type: Local - - name: 12-el7 - annotations: - openshift.io/display-name: PostgreSQL 12 (RHEL 7) - openshift.io/provider-display-name: 'Red Hat, Inc.' - description: >- - Provides a PostgreSQL 12 database on RHEL 7. For more information - about using this database image, including OpenShift considerations, - see - https://github.com/sclorg/postgresql-container/blob/master/README.md. - iconClass: icon-postgresql - tags: 'database,postgresql' - version: '12' - from: - kind: DockerImage - name: 'registry.redhat.io/rhscl/postgresql-12-rhel7:latest' - referencePolicy: - type: Local - - name: '12' - annotations: - openshift.io/display-name: PostgreSQL (Ephemeral) 12 - openshift.io/provider-display-name: 'Red Hat, Inc.' - description: >- - Provides a PostgreSQL 12 database on RHEL 7. For more information - about using this database image, including OpenShift considerations, - see - https://github.com/sclorg/postgresql-container/blob/master/README.md. - iconClass: icon-postgresql - tags: 'database,postgresql,hidden' - version: '12' - from: - kind: DockerImage - name: 'registry.redhat.io/rhscl/postgresql-12-rhel7:latest' - referencePolicy: - type: Local - - name: 10-el8 - annotations: - openshift.io/display-name: PostgreSQL 10 (RHEL 8) - openshift.io/provider-display-name: 'Red Hat, Inc.' - description: >- - Provides a PostgreSQL 10 database on RHEL 8. For more information - about using this database image, including OpenShift considerations, - see - https://github.com/sclorg/postgresql-container/blob/master/README.md. - iconClass: icon-postgresql - tags: 'database,postgresql' - version: '10' - from: - kind: DockerImage - name: 'registry.redhat.io/rhel8/postgresql-10:latest' - referencePolicy: - type: Local - - name: 10-el7 - annotations: - openshift.io/display-name: PostgreSQL 10 (RHEL 7) - openshift.io/provider-display-name: 'Red Hat, Inc.' - description: >- - Provides a PostgreSQL 10 database on RHEL 7. For more information - about using this database image, including OpenShift considerations, - see - https://github.com/sclorg/postgresql-container/blob/master/README.md. - iconClass: icon-postgresql - tags: 'database,postgresql' - version: '10' - from: - kind: DockerImage - name: 'registry.redhat.io/rhscl/postgresql-10-rhel7:latest' - referencePolicy: - type: Local - - name: '10' - annotations: - openshift.io/display-name: PostgreSQL (Ephemeral) 10 - openshift.io/provider-display-name: 'Red Hat, Inc.' - description: >- - Provides a PostgreSQL 10 database on RHEL 7. For more information - about using this database image, including OpenShift considerations, - see - https://github.com/sclorg/postgresql-container/blob/master/README.md. - iconClass: icon-postgresql - tags: 'database,postgresql,hidden' - version: '10' - from: - kind: DockerImage - name: 'registry.redhat.io/rhscl/postgresql-10-rhel7:latest' - referencePolicy: - type: Local diff --git a/charts/redhat/python-imagestreams/src/Chart.yaml b/charts/redhat/python-imagestreams/src/Chart.yaml index 63edb21..5c10d97 100644 --- a/charts/redhat/python-imagestreams/src/Chart.yaml +++ b/charts/redhat/python-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat Python applications on UBI (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: python-imagestreams tags: builder,python sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/python-imagestreams/src/templates/python-imagestream.yaml b/charts/redhat/python-imagestreams/src/templates/python-imagestream.yaml index 3e2c84f..2c3f19c 100644 --- a/charts/redhat/python-imagestreams/src/templates/python-imagestream.yaml +++ b/charts/redhat/python-imagestreams/src/templates/python-imagestream.yaml @@ -104,38 +104,6 @@ spec: name: registry.redhat.io/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.redhat.io/ubi7/python-38:latest - referencePolicy: - type: Local - - name: '3.8' - annotations: - openshift.io/display-name: Python 3.8 - openshift.io/provider-display-name: Red Hat, Inc. - description: Build and run Python 3.8 applications on RHEL 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,hidden - supports: python:3.8,python - version: '3.8' - sampleRepo: https://github.com/sclorg/django-ex.git - from: - kind: DockerImage - name: registry.redhat.io/rhscl/python-38-rhel7:latest - referencePolicy: - type: Local - name: 3.6-ubi8 annotations: openshift.io/display-name: Python 3.6 (UBI 8) @@ -152,19 +120,3 @@ spec: name: registry.redhat.io/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.redhat.io/ubi8/python-27:latest - referencePolicy: - type: Local diff --git a/charts/redhat/redis-imagestreams/src/Chart.yaml b/charts/redhat/redis-imagestreams/src/Chart.yaml index 56353c5..ed888fa 100644 --- a/charts/redhat/redis-imagestreams/src/Chart.yaml +++ b/charts/redhat/redis-imagestreams/src/Chart.yaml @@ -4,10 +4,10 @@ description: |- annotations: charts.openshift.io/name: Provides a Redis database on RHEL imagestreams (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: redis-imagestreams tags: builder,redis sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/redis-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/redis-imagestreams/src/templates/imagestreams.yaml index 0b95f27..5afdf04 100644 --- a/charts/redhat/redis-imagestreams/src/templates/imagestreams.yaml +++ b/charts/redhat/redis-imagestreams/src/templates/imagestreams.yaml @@ -58,19 +58,3 @@ spec: referencePolicy: type: Local name: 6-el8 - - annotations: - description: >- - Provides a Redis 6 database on RHEL 7. For more information about - using this database image, including OpenShift considerations, see - https://github.com/sclorg/redis-container/tree/master/6/README.md. - iconClass: icon-redis - openshift.io/display-name: Redis 6 (RHEL 7) - openshift.io/provider-display-name: 'Red Hat, Inc.' - tags: redis - version: '6' - from: - kind: DockerImage - name: 'registry.redhat.io/rhscl/redis-6-rhel7:latest' - referencePolicy: - type: Local - name: 6-el7 diff --git a/charts/redhat/ruby-imagestreams/src/Chart.yaml b/charts/redhat/ruby-imagestreams/src/Chart.yaml index 52c9864..38f441f 100644 --- a/charts/redhat/ruby-imagestreams/src/Chart.yaml +++ b/charts/redhat/ruby-imagestreams/src/Chart.yaml @@ -5,10 +5,10 @@ description: |- annotations: charts.openshift.io/name: Red Hat Ruby applications on UBI (experimental) apiVersion: v2 -appVersion: 0.0.1 +appVersion: 0.0.2 kubeVersion: '>=1.20.0' name: ruby-imagestreams tags: builder,ruby sources: - https://github.com/sclorg/helm-charts -version: 0.0.1 +version: 0.0.2 diff --git a/charts/redhat/ruby-imagestreams/src/templates/ruby-imagestream.yaml b/charts/redhat/ruby-imagestreams/src/templates/ruby-imagestream.yaml index d7da399..5a15bc2 100644 --- a/charts/redhat/ruby-imagestreams/src/templates/ruby-imagestream.yaml +++ b/charts/redhat/ruby-imagestreams/src/templates/ruby-imagestream.yaml @@ -88,22 +88,6 @@ spec: name: registry.redhat.io/ubi8/ruby-30:latest referencePolicy: type: Local - - name: 3.0-ubi7 - annotations: - openshift.io/display-name: Ruby 3.0 (UBI 7) - openshift.io/provider-display-name: Red Hat, Inc. - description: Build and run Ruby 3.0 applications on UBI 7. For more information - about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-ruby-container/blob/master/3.0/README.md. - iconClass: icon-ruby - tags: builder,ruby - supports: ruby:3.0,ruby - version: '3.0' - sampleRepo: https://github.com/sclorg/ruby-ex.git - from: - kind: DockerImage - name: registry.redhat.io/ubi7/ruby-30:latest - referencePolicy: - type: Local - name: 2.5-ubi8 annotations: openshift.io/display-name: Ruby 2.5 (UBI 8) diff --git a/charts/redhat/varnish-imagestreams/OWNERS b/charts/redhat/varnish-imagestreams/OWNERS deleted file mode 100644 index 227f4a8..0000000 --- a/charts/redhat/varnish-imagestreams/OWNERS +++ /dev/null @@ -1,9 +0,0 @@ -chart: - name: varnish-imagestreams - description: This is the Red Hat Varnish imagestreams chart -publicPgpKey: null -users: - - githubUsername: phracek -vendor: - label: redhat - name: Red Hat diff --git a/charts/redhat/varnish-imagestreams/src/Chart.yaml b/charts/redhat/varnish-imagestreams/src/Chart.yaml deleted file mode 100644 index fa2884a..0000000 --- a/charts/redhat/varnish-imagestreams/src/Chart.yaml +++ /dev/null @@ -1,13 +0,0 @@ -description: |- - This content is expermental, do not use it in production. Red Hat Varnish Cache HTTP reverse proxy imagestreams. - For more information about Varnish container see https://github.com/sclorg/varnish-container/. -annotations: - charts.openshift.io/name: Red Hat Varnish Cache HTTP reverse proxy imagestreams (experimental) -apiVersion: v2 -appVersion: 0.0.1 -kubeVersion: '>=1.20.0' -name: varnish-imagestreams -tags: builder,varnish -sources: - - https://github.com/sclorg/helm-charts -version: 0.0.1 diff --git a/charts/redhat/varnish-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/varnish-imagestreams/src/templates/imagestreams.yaml deleted file mode 100644 index abdbdd8..0000000 --- a/charts/redhat/varnish-imagestreams/src/templates/imagestreams.yaml +++ /dev/null @@ -1,107 +0,0 @@ -apiVersion: image.openshift.io/v1 -kind: ImageStream -metadata: - annotations: - openshift.io/display-name: Varnish Cache HTTP reverse proxy (varnish) - name: varnish -spec: - tags: - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on RHEL 8. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/5/README.md. - - - WARNING: By selecting this tag, your application will automatically - update to use the latest version of Varnish available on OpenShift, - including major version updates. - iconClass: icon-varnish - openshift.io/display-name: Varnish Cache HTTP reverse proxy (Latest) - openshift.io/provider-display-name: 'Red Hat, Inc.' - sampleRepo: 'https://github.com/sclorg/varnish-container.git' - supports: varnish - tags: 'builder,varnish' - from: - kind: ImageStreamTag - name: 6-el8 - referencePolicy: - type: Local - name: latest - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on RHEL 7. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/6/README.md. - iconClass: icon-varnish - openshift.io/display-name: Varnish 6 Cache HTTP reverse proxy (RHEL 7) - openshift.io/provider-display-name: 'Red Hat, Inc.' - sampleRepo: 'https://github.com/sclorg/varnish-container.git' - supports: varnish - tags: 'builder,varnish' - version: '6' - from: - kind: DockerImage - name: 'registry.redhat.io/rhscl/varnish-6-rhel7:latest' - referencePolicy: - type: Local - name: '6' - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on RHEL 8. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/6/README.md. - iconClass: icon-varnish - openshift.io/display-name: Varnish 6 Cache HTTP reverse proxy (RHEL 8) - openshift.io/provider-display-name: 'Red Hat, Inc.' - sampleRepo: 'https://github.com/sclorg/varnish-container.git' - supports: varnish - tags: 'builder,varnish' - version: '6' - from: - kind: DockerImage - name: 'registry.redhat.io/rhel8/varnish-6:latest' - referencePolicy: - type: Local - name: 6-el8 - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on RHEL 7. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/6/README.md. - iconClass: icon-varnish - openshift.io/display-name: Varnish 6 Cache HTTP reverse proxy (RHEL 7) - openshift.io/provider-display-name: 'Red Hat, Inc.' - sampleRepo: 'https://github.com/sclorg/varnish-container.git' - supports: varnish - tags: 'builder,varnish' - version: '6' - from: - kind: DockerImage - name: 'registry.redhat.io/rhscl/varnish-6-rhel7:latest' - referencePolicy: - type: Local - name: 6-el7 - - annotations: - description: >- - Store web pages in memory so web servers don't have to create the same - web page over and over again on RHEL 8. For more information about - using this builder image, including OpenShift considerations, see - https://github.com/sclorg/varnish-container/blob/generated/5/README.md. - iconClass: icon-varnish - openshift.io/display-name: Varnish 5 Cache HTTP reverse proxy (RHEL 8) - openshift.io/provider-display-name: 'Red Hat, Inc.' - sampleRepo: 'https://github.com/sclorg/varnish-container.git' - supports: varnish - tags: 'builder,varnish' - version: '5' - from: - kind: DockerImage - name: 'registry.redhat.io/rhel8/varnish-5:latest' - referencePolicy: - type: Local - name: 5-el8 diff --git a/httpd-imagestreams-0.0.2.tgz b/httpd-imagestreams-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..6f8d1b772e10270a9bc58ec0b132dbbde44f8e2a GIT binary patch literal 982 zcmV;{11bC;iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PL6FQ{y%e$9eW&v2THyM0SjU;F;bG9JDY)uQx#3=Z(C?Dzc=J zNs_}X zYd(`CdHR_grTaVM?C>BR9~~Zz4|bCAK{DRof#j9$-)Ob-Xm^tDzUygm@5E3k?a>RZ zTpj`NFnh~SO=b6y4!isXZrUEX|!-+v&5?tKgeuf*ebF$Fi9@wQXhODSad6at* z8u1%hC$!38o_|ErC#X+Ez{RfKy%j#_6m{0EHq8jtBxFE|24x@MS$^TvxH< zQrlVFveP{sv*^B_Qdi&L!w+MYCM+35Z3~~X7CBv8PA-o|o9-c5joQgX9%n9xX)R z1zQo152NlJ;4}~ds0wi5CUC)*ciJ)+xFH?T3a&5CuUIeO2GyvYP&4pByOvgKdeLfApeOLU5oBKy zG@9XIsYamh;36anI7cCIDk-$JtA5yv)wKyK{6pI=M0*j!x^o{87yBkL%39&4LVRsVK22yq=2VWu9r4w@WvQV=&ob z@P;vH`|{2>7?z?aNWCf!YiO_~$wwT%2LqCmmwn;h+SazVwKrma1pom5|0#Iy`T!UJ E0M@47>i_@% literal 0 HcmV?d00001 diff --git a/mariadb-imagestreams-0.0.2.tgz b/mariadb-imagestreams-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..8dc7b841f96762f7d33de7e4d8fa67dd10f2bbfb GIT binary patch literal 944 zcmV;h15f-PiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI##Z`(Ey&a-~Sy*UMJiE^ws5wHSnldS>Lu1JgR`AnT{E)*${ zlsEtTfs`Z5uA6j;)2x8+MK;0v$h-UQK9*<%7L$P}aYoh|!qO)1=4f2J#8MvZ!x&@i zbTkTI#@O~ZWuxIyIy%jU>G*V0|iJ?;3p%Yr! zJObdp@;25LDLWTa7Ym&zEGdT@D&Rdj_}~e1@fHenI6+Hb$t(mX=rRb7>7R;>C`mb# zuOh6(A7rf1Du=}|!m4WjvY5rgs36OYs9ae3G8Y!OR*sYdVIg2OP<<#gDD9xO1j2z( zP#Im++@bB$O1<2%^Sz?t2R(-Lm<>tn=*tCIMKDo6>0{~-=K{!MAnZ0gyOO; z{D$8vQlEW-{5`EG$TT_ZgC&BwbCu1LWG39ap2S?2iRDt8S#sBIJ~|YNOfr#rl9Xs2 zndIj3&BceyxGdu6ww_R%qu%RZ(s;;X){B~A?CRRc>e_I!c{I4^0&|k(ps8}?aAxy1 z%>D{AT5Oi)r5Sp#=d_*k-%(jfbYzq6@}mXef%%_}#^cTTKV;(}JIwzdVYfmRIb8WN ze-35dnAM^Dn`*E~qmmr@so@1EVU<@LkL z)4|)NLEo!D9hm>3Ma~f2X;I4JtSd-S2lLN2Hy^J){+7erC0LTgT`QUnXMI@e+5lFS z6ugP>Zy_aM?X-`Wqm;`IT3r?B2%HY0?&h>AJFJ8V^t8<=E>K9E$dJ-D1^o`%IzuJ? zrA-UcoMPj4tKeF_lW1)oeh$_gUgbZiV{cm?@2D^}x?I!nt2X+A>smI9@(CS~JX64a%FV|3RSy2wxnxow4g_Ol79skF6gNK1*&qg?VftCozZ}$b9-Pajis(kZx z_G3Haq}v&LA{0RT@ap*^?jzcT=C@=5-L_cPGc*&{nPqIKm}97?nUg$ggG$*+-ZWV6 z2~^DXL&fZ6shIuzRLq{AirMo~G20Ur&-X{g^ZyMM&kt05W-6XPm5ML@d_UO14tB6d S+rI$-0RR7so8Mjl7ytk{j@7>a literal 0 HcmV?d00001 diff --git a/mysql-imagestreams-0.0.2.tgz b/mysql-imagestreams-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..c0d79da20895d02f1467a54a642488c8d5fa8bef GIT binary patch literal 907 zcmV;619bc!iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI##Z`(Ey&a-~Sy*ULeiT3PN5wHSXo2>!Tu1kvT`AnTHE)>a; zlsEnRL6jrQZsrznkgkBg7ukgFqwenGeXJVymyAV)D{|fvRxW*0qV-9Gl{|YIFvi%$ zY!;r3vHja{4y0YbTT)m3GIh%?gDgn=YhY zq!l_(Hod)i{r3G;QWZ&bUoWVy&FIySlVr*gHj26ye129Vr)$f}(CD3M9R#rJ2J1;wk;is|w1zR5OcB7In*i*D7Qz{cP29zV0UbF*ynQvyr4SNt zID-UzSbBu`YslgJCUCrXJi>H#VdLG<(Z=bSK3I>Q&sY!@zg;-BByJeRp;9 zW#<{N9rmEZ4m6-S+KZwA*&nZOKU{zKC5N9Ha3qQQ-Yq?@#?a{60vaO)?^63)NC{Yb z-KNS>%4Wb;n*u$7*TKhqNt<57#)m*JH-*GC3W*CDD%oc~9&l|7Q{kW5_7vS7F6mzt zT&p({oy)_|xU0fLo%`21e|*q$i>1}oR&$@7mruBDUMHX|VKK>UvubHcmK3LtS_(n>gQo5WI4VrZW&NnUQ!$XMQ;pV4uW%brMb+5baw*-3Iw hF1hR|$$jg)&Iu=+aKZ^&{2KrO|Nq;)F=+r6007L=xIq8_ literal 0 HcmV?d00001 diff --git a/nginx-imagestreams-0.0.3.tgz b/nginx-imagestreams-0.0.3.tgz new file mode 100644 index 0000000000000000000000000000000000000000..77690e357f4e6843f415cc0129ffa54f47b65356 GIT binary patch literal 982 zcmV;{11bC;iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PL92Pvf`~$9c|QF>eK_P2A9h66v?nvdiy4;<#0pyL+A{)6|D! zTej1q|NY5Mn@!6er-d$epw3IciDx|H`FsZV64_ zp|6f20Dwcf*JOA_(xEttQ1jo&SgvFSi!?&5+h1AC;^U|wn;WiOSh}5a3%Qbxqyugt z_-b7Bp->=|gW3{s2VDB#MVMEY4_g$Zy2X6 zX1%DX^+PBlt7?;z&7#30!RI8ZL34$X!_sCj^+h1l4<4h%W}*H4e}jKVl@{p8Cf(&{ z2*Tt1583GWbd&#-jgF7^{J(^CX$;rB$^K#(-EmoDaOK~939S%S1YFLP zslwp^r>gcU#bpW3>)DFRj=NC$K5&_fy71rqqDg-7W%TE>ydcvg+6PPBb39Fnyxer< zDC&6p{lnzu>gJ~m&X-_GQ104uJ1qOKRJ8%rTJXF{?@ulSVC|GoH%B3s9dETR&=EKl zRNBo6g0whTX%VQ|s_M8vE^sQySF=sO-z`#GoeKX@rghQ8uyOk-&z1Zr(Aq5gIA~gE z{r34CdL2?Y`nE@H)WYA_VAFMPH9-4tCG)t~?zLEHK@-v{gWf;gCf&y+cb(0(*2*}$ zrewX|h<|TG{nxu@Mpa*Nc|i9qmhH>tQx6 E0I%u(fdBvi literal 0 HcmV?d00001 diff --git a/nodejs-imagestreams-0.0.3.tgz b/nodejs-imagestreams-0.0.3.tgz new file mode 100644 index 0000000000000000000000000000000000000000..cbcad12ef95d488297ad22212b22cd1849a47e0a GIT binary patch literal 1076 zcmV-41k3v$iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI=cZ`(Ey_Ot$qdrJ#g5~VnvB47iWw%ana*^qSGGcBEMCKO4K zlve}$;|Kk)Y9+3*Rf-*Zz858A?#SbP_uU6X$Q195%Q8AcV>Qyu_;2S_TW?7-KIp{= zA!Ixnm0v>0<8MID$Ae%rz6gWw#uvf)fCLx8Xfy!Q&+*$WH3r7XVBzoK3CAq%UZOG2CJbKT``gGR0r+fGWjVQaOSY@cY#@yu!~4HOo*~ z%3nKFu|H57CPfU3(4k5-zY>pl=T3?y(M;KL>C>DUNTjeREHDFQtSZzHQVBv@$PEIs zzyv5Q(>y6WJ-EslPl1XQbS@m&azhV(lo~Rr5tx`tot3*lCo(UBGcf~OTw_v1L=9zE z3>^R_5}v2U{;vwfUGXx-T@6c7S0@a?Ai~^QWn$l-F+0yEULrH!BwXs5Z$jqQy;dYi znLzDNxSaSIH5RoW694x7n|B}Ids*r^5BUU}*E;**`@jo{N6wt878{z@F*4T)n%Hr- z++vPAbE_IVmd;GPN_AL;bQbLj?HipZdv4pr{}waFsYT;I-Tjuau$}*dQ5c-J`9BQC zV{+pEU6|{-&I1!^4A(`G@5&;#sJkqFdm=0XCqqk9YH2Yv)=9|$cr;P~TD~bWiqoZA zITc*(-5bX!Oo~4)Ny!0l>!2kJZ5icB*nblkUVSJdyx!!Yv|JPn?zUa)NjHRRk$AOV zYgGO1)~nE-Jc+K-ZB_+h zi4<=+H6|{9bQ?4lwsF)|TP9aZYHQZ;TQ1W~alAz(<1KGnzbk(BW~>6~RLg9I&L?g4 ziO%Y+3TPp5^9hT}HH}l$C=&cla+WMtG3-)d3?F1d`C3<0j+Y(UA|&vtkZhN|Hpb>| z2+2mZc)7VH8UVh4)@W<8Za{04)mcc+dPmtinLMB_vDSi^#u+nKFFlRvoR-Bckh6*z zl6Z|_{}Tp-s4E78Xm=P4qC>@C5IqM5gXqOzFo?bxgEbGj851lkcRKSSe5_*akr!82 z_=3#_k3CC=CT?e*T$SMH`Er$LSKjOavkial5VK$7(Zj=R5IrYmUlhM~#_YOK?Z&Us z{&+Qd`Lq65^=8zY-t2dmM(y&3hWH>3UQ&FJuE_p$5EsCT{D u2WA`o+`ryDK+GPy-i$iy&3*qXxKCIA2oQ}(?8 literal 0 HcmV?d00001 diff --git a/nodejs-imagestreams-0.0.4.tgz b/nodejs-imagestreams-0.0.4.tgz new file mode 100644 index 0000000000000000000000000000000000000000..267003eca557c5b76775a3e45e4086611895247a GIT binary patch literal 1076 zcmV-41k3v$iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI=cZ`(Ey&a?iCdrJyf5~a9~B47iWw%ana*^qSGGcBEMCKO4K zlve}$;|Kk)Y9+3*Rf-+Ez858A?#SbP_uU6X$Q195%Q8AeV>Qyu_-|)aTW>)#e$tB( zLda-1EWd=1$KQaQk4}Q&=ye!ej4p!V2?<^Y!;2Fj{T#p9a$~7JA)U{9oZOxm6+&8S znG_~=0Ft8g#*+$#nX!rWnDhnBFos)9;TLM*MyB}d9Z;n>ODac@0{*zVhBN%EP_qn$ zrTmpc75fvlVN%2}4;`vh^DFU)H*``oiDt@{OP^-UKq7@jVSyPaV^yIBkV+8JLT(V4 z1tvggndV91>A_XbcnVacpmX8Ch8ueDlhlw&jljf2>a5%aI+l46oQWye;u_;3B5EkR zV&DKUk?=e%_J30-?uwTw?rKeE%;nh6sIjR1kodRn-@NTDKLlP#JaXz(wOG@%j*+=e(8P|r z;TALGnOoJ^v2<$UWvYWJq%&_1F{F&3Th0XjQ48!2O&HrIA z8l4~ce;ekyuJgb|8pCx_v}>xWQ=DUP?OWW3>R>vzS^-jr1!ooJaY(fOpU zKGA8tRRJv|Za!vFxu$V~8byM?OU{zTGKO6!jNyY!C|~J{%JH&8TZ9D83dwfaYh$eM zhLEgPijtz&S)GRDw0D%flgR_>5^F7pX`C`+^}^Gb&S+WO0y)c= zA&FNQ_J3h8h`M4hh_;8pAlg?92GMh1Fo<3Z27~CEFCG+}T=L~MF!&Xo+ye|As@{xx)0&>XM-rV)SLXLK{qaE$LvVQ{r0RR7`vk+VWCIA5TC>SFE literal 0 HcmV?d00001 diff --git a/perl-imagestreams-0.0.2.tgz b/perl-imagestreams-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..e94e28f8010bd9a40a3ee00b4ca4217ba1ef54da GIT binary patch literal 968 zcmV;(12_C1iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PL4vZ`(Ey!1Jt6ac@Zh>u+q;5wHPG+id~5u1K@(aiFQQ%!MKe zlJaU`AATSuYgX(eSmGur=6g{>>P~mO-`&v)H4j-$Dl}FjsZIQLL9~rlq~=F^k|arz zd_4BgBuQ>Q({z#^rQ>{(rLXhX>G&u~$9Xn6f@EI~+$D{%L?0!O{?^Ulz7ZipNJ}h} z!W01jb;&o8R4B}X&27YFEJ%$7Tw)175euJCb0A7_Mq4$I0)9QefD`_ge2pP)ZQeLSqn^1tvggSvJ&ZMsVIRUIGy%=tcx^YseA&AT`udBQPUa{JX7T0wH}8IaAJt_PTsJf9&+7R5@6sqs zqU1PeQ@hmz0wWtu(G)>=hYt(nb=W2^u%t4@I?$0b7%Ydmd2Y}TvQxJEzr|W{V$sA~ zdk>rn_w@fso}3Q*f0kxxdg%X8Az>H>*G!ZJT)0Gk_K6;JS`WamJ1^6qMoUU!i5nXK zc98(!#y|lWXqL<pU6jJx5Zy^Cd*xB<8T5n>@=Dk+oaiQNsBO8dVaDV5Og~c7a_cp&JMw=iPxV3FBnO(VbQw>1Oyf`BUm%uQhDe zsbN%#x11PL_&>vrKPNk;QM+LprKGl|r`0c#T5-HYC5t9ONMXQ~4(V0RR7ONwBs67ytlxlE?c1 literal 0 HcmV?d00001 diff --git a/php-imagestreams-0.0.2.tgz b/php-imagestreams-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..a48b6f29ba763e71afda90193e70340a1174cc0a GIT binary patch literal 976 zcmV;>126m^iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PL4vZ`(Ey!2PUGac@Zhi=qrAQUq*3({@XMt~1hZd#0tc#DyXW zlJaU`AHJYu8~&4~Xze-);CoR*>W;j--`&Z&)*)|Lh1MBljg8*a%s4V~&^SqwiviGs-QW>vtz%|D_daXexfdc#O68d2O4>XC zD17!UQ5vPK`P31vBFP%e;SNiZ)K3+MP*qu~uo$Hc3EY5q4F z%azPwHVT;5tA8n>WE7NW3&XYRmOj4014Z1tvwP%4nhL2D7X11>=uRknrK zByinwQ38`Cm{tbxwd)c1O&MsELEv(#Ow;WGo2b@X=CT6k?=bP^&_GubL*TLyZOLU7 z0Q{*@e)KW%7qz@Z)1NQ|iwL!I+U8MIaaXq!Qm7`fg;1u7?1+cH%Dj7wOEl3$s7cf? z>(E3Qq0!yD*KhxLN1BoZ_w58%fjay3mzazwp=Uv#gY9AstZGexHV?u_E>NRr!alKq zW0lR9UJiAwgV|ggp<~q$=BhR8Zo+?D2w<&K-m!uSF^5){%po|{ z&1zTUB8#w?F`%Y>v}TM8HWBDUwQ_Ua_lEte%u21dYnN%^g_3Usvo`Pk414gr>`u3S z-L_gQ-J=gCekK*~ahw{}EIHh%oKLJ;Z1q@Wgof>eXWgQ~ zDH@aoj+NlWd}+kZHRkYM6-=xZKt^J(dG&)OkdYY9{dd{bL91XFeSgqH--A~V7r+X* zr!Rzfy$}w9R-Tb~ZEy8yb(WF%?C{*ZRmDA;j=l}(3|8DaGbaYinsxd1By|Hli}SVC z`kh45{fMN;B9gvPBI(Z{l759q`do;l`x2S$OJw#$L}n)5UCppOrkS_rM0RR6%#df&>8UO(Ilizj# literal 0 HcmV?d00001 diff --git a/postgresql-imagestreams-0.0.2.tgz b/postgresql-imagestreams-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..ba21f5f6ee9bdb64672e7ee48fb78fe757aa4124 GIT binary patch literal 1540 zcmV+f2K)IRiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PI+6Z`-&M&1e3K0eS(afUSq~HgF51ZF&>R%BlC)FG$(4oW$uP>0=k>m&CMYIFECV#VN_Uu|fN%>dAtS(K>^?u<@&$8y8J^ zp*9}9k|arXx3|OJBuQ@nP4@P-H`49hoqoEvyO(ZnBN(@3{1uIrqz5qRGhUX>$0SOkKFiPwBTE;yE^}!?kanmYNDIMN z?WzkIfhGr)MUW1phSE@032zzQ6DNa*BaPq<87RmgNIfD`gmM5MQni$>4~I*Q1}q{2 z$ekKs>Ude*mX6;Ch5+L|E5ttiINVh3%r7f%u;0p+5zi5 zaAJxI-H+mFlYm;S>Dd+1cwa^S__&q z$O6AtEJ?%p@zLo+s?%~-S*ge1yc{+jLRY#VwNO>&zkXYyzVLZ?jj}$8xP0bZbzvuJb5h?mr?yrIQ9f7(3#K7!75it8d7?}MvFuxF({cj1({?`EWN5A>kYt{X)Y049v@rnCi ze|Kl=*8FE@duu)a`7Y~OTUU-z6%ZzWO9K+dE^~yDR5+i3Sl~*5t;&*&!>sLNXAN?s#mSSp%&CFD8-Pi?8k5o6Du!7<%< zuO2n7HgDxIuavP4GP==P?a;iPFf8|GEOHXTN9Cpm1cSQQZfPA01eSCCGq;sto;Tp}d`SR1Y1!pU=!`-qaN_ zuG(+KUf1G81DOm>sCJIx8srFYf@bP+-zFbbF=JY3Jb2Z#3#QVG2=4?)0>&6dr#*rX zmUK93QT5VD?bwq&S6Poh4>|}nk`}D+?!mwWJwO;?4^>+XO0RR6cPR4uy9smILnfnp| literal 0 HcmV?d00001 diff --git a/python-imagestreams-0.0.2.tgz b/python-imagestreams-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..353e01c421dc3ccaea81160e50645f22608e4511 GIT binary patch literal 1026 zcmV+d1pWITiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PL7=Z`-yL$NgBZ;+`c1tbdN9NCJL8plQ1;K-U#%w>_q%v&@Df z36k<^U@v|kWeZl~7;Eh~@#=fxg!CQ%+~>YWST4*=aG%zsLTwb1T8D3DM44bgYBt!5 zMNt$b;B=6#0clY z5JLsmxd%|#)ayV<v4mfUfsYOtAW||~w2mM+{C<4{=lE5kqBU|u z*ej1n`Ufga115|^H)rJ~EDS!(DjYgmb zCZO(OqfZ^rIb(-Kv?!Vokf%#4vb55tO@Su+U=QHQ!UcdeIT~L>Sch^j?yRWnV|1Ssh zZ`sETS?#x3_6(_XzB=r%4e8DMIeKnBPxiF7N&gMjk`aSCd^r0(ZDG6q$8mCb+1LM3 ze03F_^#2g%`@VNad6~nFP4Xv~Bep0?_jw-0rlZifAP=Jci@0$9-UWEI$w4YHxBBh(J(qoM2sgY4mVUiP z^|!wqg?{JRd*3-s*U8qKPIt0DU*CSX`S5cN*9*|durS>w4XK8(5RFe=>khkq12y>~ROi`-)~o!`Lhv_? zXq~%1{SHNI8@pUPr5h=QGI|YOH%w~D@D`=Wx7=;{h44!F_%*0#i|AB|dd230n)*zt zEku&&wn*M$uM=l0E(?X@;G z7KB@D(|a-7To)aLFQPvBud@B}mfP_CuXN9^Gdp*-cOu`4;trMLvWKI>ifW@4fx>b| z90V4z)eGPvj`KA!{zhK2opH?$NNaYyux3xnYW6s)*~=j{+X2*8Skrw7Yx<1BnjQnI zKeVu>dlc54aLo=#>t2Q_&)peEl4>T~~Cc(Rk7>_27y1ONd4|2fF5MgSlH01Uk7(EtDd literal 0 HcmV?d00001 diff --git a/redis-imagestreams-0.0.2.tgz b/redis-imagestreams-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..15cb5abcc26db5975fc184aa8eed82e540192f37 GIT binary patch literal 877 zcmV-z1Csn7iwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PL1gZ`(Ey$NkJtac@omOQJnbP6Vt#*Jf*gtSj7Ndp=WViwi{( zB<0QDeh_6SvQs!k=MF94dyy^c{yZLk|C1e+(kHUU4f)^*YoEQY(1mn|wHlo#IOjZ{ z&*PPIethMN`46M%JpXYvUF3`De8i{o#bPl6ex~(LM&kpz5&zF?9dGVC3DnvI4AN*{ zFaXh>y-$rL?JKzssWh3!nhJRD%vP4<0b$uP10@Drp(ijJmTzzGVF(di(La`)tVst{ zFBn?+2RSc|E?_%jXl?(Mr#zjplDu%zhIs2^B|QkE1L*+LL)7Y|CQusCCP3o}WB{qb zI#V{H%}fVXGWeW2Q~1R=sEs3#dTm@CTLHK-P1xtRb)eMb7=R~&Dg^6`EZfLXHLFyZ zI`cvqx5+v$_0MN1duUeFZ*=_fr)fIlDIc@0rBA)bylI>uU$ErFIu)rp=}w9T-1q`k zjZ`JMNmOLp!`7ZW|4;ZoP;C_k^4USBzI-4&_(Ij`$fn+DISVE_GB^80&HsshfSb z@}h%e{H2VwfZlvP#I7%h#WsA0h+Ur(vFp?SFE4S4OI+d--)8(900960(x(N%02BZK Dv@ECJ literal 0 HcmV?d00001 diff --git a/ruby-imagestreams-0.0.2.tgz b/ruby-imagestreams-0.0.2.tgz new file mode 100644 index 0000000000000000000000000000000000000000..4f168fa71b804cd985523b031770ff0dcba9828d GIT binary patch literal 1007 zcmVDc zVQyr3R8em|NM&qo0PL7iZ`(Ey$MdXDac@Zhi=yN>O$2N}({@{ct{dELd#0qb%!MKe zlJY8GAATU^xVGbDXze%&;(Jjd>P|e~@BSy)v_%*5hSg}DLDtyh?UWfuI@XAz9T}yR zo}HeCE2VV(n$m1^l%AfAvh?-Y>-6-9rlYi*Je2DD9L_9N{XFtic?{SivvM!MH6tU|I`a_HLjg{Bd~&C-_C9;SEa1#H)yD z{wEsCmCRw5MNI3(zm!mtMHSl8aP7ja&r@!pRMMezz%7JWeW(Fc3Z!z-S_JNZOVCDD zZRtG;T((?Pz+?rcl@Z*zKLS4~1C25WTuzi}!YZ&rwLUbLH8{VC!pB1cp(h5wWhvT< z%Q^!1O{4tePsQ)l@(NA=h5=Yam^!Czo+LGQ)3zX`Y7$!tW$MIcJPv*46J%VXNeZEg zq+!;fNrr?bsA!0JSprBQ>9Rm?FzG`=cR1h6(x09HIJZna=tJfA7v#cC}5 zlR=gufOsA+Fz7;vTQUDPDx7=>?yojIu8o>`^^Vv4`Uy9HD_N4c-^!5sH=f^x)v5Df zGiR3*#~H*sCe9+Ozut^LUVZ#IhszEu3M}1Xi;mR;=u~T#^Mrr65Wrfed}bvRqJvgf z%po`x=CzyRypS-TF`y>%^O`X(SRv3K)*{j6>>KvCG7G;xu)V1aFO_^Nn6-KMGoIt; zZNq@;7i_DwGR`hw4L4b%1&&dx{GJmHr-@%k&3hy#Mm0Aq-s+#vte!9RWDN<8+k&5m zn+7LnP?q?+61?ngg1Am&4j)v>#8MLsN$Nc>zPAmAB!v_Ib#}4SPS}9If77PV!i&vK zuwd>{nql?xD_w4eUD1^fNxHnc_{2IMlJt1T?7dUvHJU)+3U~%t3?hQ-&T(P7NgeAQTOZqghq+4K_e%0A+)bjkX)bjl4WBJn5@_bin zxdoPVZ&+?t%V&V)OH<49t<^Fkqph&a$Y@Vk`ZqmGEHg5C5G*q?+KgpJMo$9EZ1jy- dKKAb*2Rqoo4))UQzW@LL|NjfsO<@2Y003qr?->99 literal 0 HcmV?d00001 diff --git a/tests/test_httpd_imagestreams.py b/tests/test_httpd_imagestreams.py index ef4525e..a7c0f05 100644 --- a/tests/test_httpd_imagestreams.py +++ b/tests/test_httpd_imagestreams.py @@ -24,14 +24,12 @@ def teardown_method(self): ("2.4-ubi9", "registry.redhat.io/ubi9/httpd-24:latest"), ("2.4-ubi8", "registry.redhat.io/ubi8/httpd-24:latest"), ("2.4-el8", "registry.redhat.io/rhel8/httpd-24"), - ("2.4-el7", "registry.redhat.io/rhscl/httpd-24-rhel7"), - ("2.4", "registry.redhat.io/rhscl/httpd-24-rhel7"), ], ) def test_package_imagestream(self, version, registry): self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -50,12 +48,9 @@ def teardown_method(self): ("2.4-ubi9", "registry.access.redhat.com/ubi9/httpd-24:latest"), ("2.4-ubi8", "registry.access.redhat.com/ubi8/httpd-24:latest"), ("2.4-el8", "docker.io/centos/httpd-24-centos8:latest"), - ("2.4-el7", "quay.io/centos7/httpd-24-centos7:latest"), - ("2.4", "quay.io/centos7/httpd-24-centos7:latest"), ] ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() - self.hc_api.check_imagestreams(version=version, registry=registry) + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() + assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_httpd_template.py b/tests/test_httpd_template.py index 3d6717f..2061899 100644 --- a/tests/test_httpd_template.py +++ b/tests/test_httpd_template.py @@ -20,10 +20,10 @@ def teardown_method(self): def test_package_persistent_by_curl(self): self.hc_api.package_name = "httpd-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "httpd-template" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation( values={ "httpd_version": "2.4-el8", diff --git a/tests/test_mariadb_imagestreams.py b/tests/test_mariadb_imagestreams.py index 20af401..2f53416 100644 --- a/tests/test_mariadb_imagestreams.py +++ b/tests/test_mariadb_imagestreams.py @@ -24,14 +24,11 @@ def teardown_method(self): ("10.5-el9", "registry.redhat.io/rhel9/mariadb-105:latest"), ("10.3-el8", "registry.redhat.io/rhel8/mariadb-103:latest"), ("10.5-el8", "registry.redhat.io/rhel8/mariadb-105:latest"), - ("10.3-el7", "registry.redhat.io/rhscl/mariadb-103-rhel7:latest"), - ("10.3", "registry.redhat.io/rhscl/mariadb-103-rhel7:latest"), - ("10.5-el7", "registry.redhat.io/rhscl/mariadb-105-rhel7:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -48,14 +45,10 @@ def teardown_method(self): @pytest.mark.parametrize( "version,registry", [ - ("10.5-el7", "quay.io/centos7/mariadb-105-centos7:latest"), ("10.3-el8", "docker.io/centos/mariadb-103-centos8:latest"), - ("10.3-el7", "quay.io/centos7/mariadb-103-centos7:latest"), - ("10.3", "quay.io/centos7/mariadb-103-centos7:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_mariadb_template.py b/tests/test_mariadb_template.py index 9ead382..809f6dd 100644 --- a/tests/test_mariadb_template.py +++ b/tests/test_mariadb_template.py @@ -20,10 +20,10 @@ def teardown_method(self): def test_package_persistent(self): self.hc_api.package_name = "mariadb-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "mariadb-persistent" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation(values={".mariadb_version": "10.5-el8", ".namespace": self.hc_api.namespace}) assert self.hc_api.is_pod_running(pod_name_prefix="mariadb") assert self.hc_api.test_helm_chart(expected_str=["42", "testval"]) diff --git a/tests/test_mysql_imagestreams.py b/tests/test_mysql_imagestreams.py index 4312470..1b9aebe 100644 --- a/tests/test_mysql_imagestreams.py +++ b/tests/test_mysql_imagestreams.py @@ -23,12 +23,11 @@ def teardown_method(self): [ ("8.0-el9", "registry.redhat.io/rhel9/mysql-80:latest"), ("8.0-el8", "registry.redhat.io/rhel8/mysql-80:latest"), - ("8.0-el7", "registry.redhat.io/rhscl/mysql-80-rhel7:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -46,12 +45,9 @@ def teardown_method(self): "version,registry", [ ("8.0-el8", "docker.io/centos/mysql-80-centos8:latest"), - ("8.0-el7", "quay.io/centos7/mysql-80-centos7:latest"), - ("8.0", "quay.io/centos7/mysql-80-centos7:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_mysql_template.py b/tests/test_mysql_template.py index d7fe513..1147834 100644 --- a/tests/test_mysql_template.py +++ b/tests/test_mysql_template.py @@ -21,10 +21,10 @@ def teardown_method(self): def test_package_persistent(self): self.hc_api.package_name = "mysql-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "mysql-persistent" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation(values={".mysql_version": "8.0-el8", ".namespace": self.hc_api.namespace}) assert self.hc_api.is_pod_running(pod_name_prefix="mysql") assert self.hc_api.test_helm_chart(expected_str=["42", "testval"]) diff --git a/tests/test_nginx_imagestreams.py b/tests/test_nginx_imagestreams.py index 0ab2554..fbd9a71 100644 --- a/tests/test_nginx_imagestreams.py +++ b/tests/test_nginx_imagestreams.py @@ -25,13 +25,11 @@ def teardown_method(self): ("1.22-ubi8", "registry.redhat.io/ubi8/nginx-122:latest"), ("1.20-ubi9", "registry.redhat.io/ubi9/nginx-120:latest"), ("1.20-ubi8", "registry.redhat.io/ubi8/nginx-120:latest"), - ("1.20-ubi7", "registry.redhat.io/ubi7/nginx-120:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -50,11 +48,9 @@ def teardown_method(self): [ ("1.20-ubi9", "registry.access.redhat.com/ubi9/nginx-120:latest"), ("1.20-ubi8", "registry.access.redhat.com/ubi8/nginx-120:latest"), - ("1.20-ubi7", "registry.access.redhat.com/ubi7/nginx-120:latest") ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_nginx_template.py b/tests/test_nginx_template.py index 79302eb..fa00b86 100644 --- a/tests/test_nginx_template.py +++ b/tests/test_nginx_template.py @@ -20,7 +20,7 @@ def teardown_method(self): def test_curl_connection(self): self.hc_api.package_name = "nginx-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "nginx-template" assert self.hc_api.helm_package() @@ -39,7 +39,7 @@ def test_curl_connection(self): def test_helm_connection(self): self.hc_api.package_name = "nginx-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "nginx-template" assert self.hc_api.helm_package() diff --git a/tests/test_nodejs_imagestreams.py b/tests/test_nodejs_imagestreams.py index c5bb164..d4da18e 100644 --- a/tests/test_nodejs_imagestreams.py +++ b/tests/test_nodejs_imagestreams.py @@ -29,12 +29,11 @@ def teardown_method(self): ("18-ubi9-minimal", "registry.redhat.io/ubi9/nodejs-18-minimal:latest"), ("18-ubi8", "registry.redhat.io/ubi8/nodejs-18:latest"), ("18-ubi8-minimal", "registry.redhat.io/ubi8/nodejs-18-minimal:latest"), - ("14-ubi7", "registry.redhat.io/ubi7/nodejs-14:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -53,10 +52,9 @@ def teardown_method(self): [ ("14-ubi8", "registry.access.redhat.com/ubi8/nodejs-14:latest"), ("14-ubi8-minimal", "registry.access.redhat.com/ubi8/nodejs-14-minimal:latest"), - ("14-ubi7", "registry.access.redhat.com/ubi7/nodejs-14:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_perl_dancer_app.py b/tests/test_perl_dancer_app.py index aed2bbe..b4d27ac 100644 --- a/tests/test_perl_dancer_app.py +++ b/tests/test_perl_dancer_app.py @@ -20,10 +20,10 @@ def teardown_method(self): def test_dancer_application_curl_output(self): self.hc_api.package_name = "perl-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "perl-dancer-application" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation( values={ "perl_version": "5.32-ubi8", @@ -38,10 +38,10 @@ def test_dancer_application_curl_output(self): def test_dancer_application_helm_test(self): self.hc_api.package_name = "perl-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "perl-dancer-application" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation( values={ "perl_version": "5.32-ubi8", diff --git a/tests/test_perl_dancer_mysql_template.py b/tests/test_perl_dancer_mysql_template.py index 017352e..8e71b14 100644 --- a/tests/test_perl_dancer_mysql_template.py +++ b/tests/test_perl_dancer_mysql_template.py @@ -20,10 +20,10 @@ def teardown_method(self): def test_dancer_application(self): self.hc_api.package_name = "perl-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "perl-dancer-application" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation( values={ "perl_version": "5.32-ubi8", @@ -39,10 +39,10 @@ def test_dancer_application(self): def test_dancer_application_helm_test(self): self.hc_api.package_name = "perl-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "perl-dancer-application" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation( values={ "perl_version": "5.32-ubi8", diff --git a/tests/test_perl_imagestreams.py b/tests/test_perl_imagestreams.py index 6344e44..950adea 100644 --- a/tests/test_perl_imagestreams.py +++ b/tests/test_perl_imagestreams.py @@ -23,14 +23,12 @@ def teardown_method(self): [ ("5.32-ubi9", "registry.redhat.io/ubi9/perl-532:latest"), ("5.32-ubi8", "registry.redhat.io/ubi8/perl-532:latest"), - ("5.30-el7", "registry.redhat.io/rhscl/perl-530-rhel7:latest"), - ("5.30", "registry.redhat.io/rhscl/perl-530-rhel7:latest"), ("5.26-ubi8", "registry.redhat.io/ubi8/perl-526:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -49,12 +47,10 @@ def teardown_method(self): [ ("5.32-ubi9", "registry.access.redhat.com/ubi9/perl-532:latest"), ("5.32-ubi8", "registry.access.redhat.com/ubi8/perl-532:latest"), - ("5.30-el7", "quay.io/centos7/perl-530-centos7:latest"), - ("5.30", "quay.io/centos7/perl-530-centos7:latest"), ("5.26-ubi8", "registry.access.redhat.com/ubi8/perl-526:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_php_cakephp_application.py b/tests/test_php_cakephp_application.py index 52d65df..ec41670 100644 --- a/tests/test_php_cakephp_application.py +++ b/tests/test_php_cakephp_application.py @@ -20,7 +20,7 @@ def teardown_method(self): def test_curl_connection(self): self.hc_api.package_name = "php-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "php-cakephp-application" assert self.hc_api.helm_package() @@ -38,7 +38,7 @@ def test_curl_connection(self): def test_by_helm_test(self): self.hc_api.package_name = "php-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "php-cakephp-application" assert self.hc_api.helm_package() diff --git a/tests/test_php_imagestreams.py b/tests/test_php_imagestreams.py index 5c44309..a68dc39 100644 --- a/tests/test_php_imagestreams.py +++ b/tests/test_php_imagestreams.py @@ -25,14 +25,11 @@ def teardown_method(self): ("8.0-ubi9", "registry.redhat.io/ubi9/php-80:latest"), ("8.0-ubi8", "registry.redhat.io/ubi8/php-80:latest"), ("7.4-ubi8", "registry.redhat.io/ubi8/php-74:latest"), - ("7.3-ubi7", "registry.redhat.io/ubi7/php-73:latest"), - ("7.3", "registry.redhat.io/rhscl/php-73-rhel7:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -52,12 +49,9 @@ def teardown_method(self): ("8.0-ubi9", "registry.access.redhat.com/ubi9/php-80:latest"), ("8.0-ubi8", "registry.access.redhat.com/ubi8/php-80:latest"), ("7.4-ubi8", "registry.access.redhat.com/ubi8/php-74:latest"), - ("7.3-ubi7", "registry.access.redhat.com/ubi7/php-73:latest"), - ("7.3", "quay.io/centos7/php-73-centos7:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_postgresql_imagestreams.py b/tests/test_postgresql_imagestreams.py index 1bf5886..12f8d36 100644 --- a/tests/test_postgresql_imagestreams.py +++ b/tests/test_postgresql_imagestreams.py @@ -23,16 +23,12 @@ def teardown_method(self): [ ("13-el8", "registry.redhat.io/rhel8/postgresql-13:latest"), ("13-el9", "registry.redhat.io/rhel9/postgresql-13:latest"), - ("10", "registry.redhat.io/rhscl/postgresql-10-rhel7:latest"), - ("10-el7", "registry.redhat.io/rhscl/postgresql-10-rhel7:latest"), ("10-el8", "registry.redhat.io/rhel8/postgresql-10:latest"), - ("12-el7", "registry.redhat.io/rhscl/postgresql-12-rhel7:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -54,11 +50,9 @@ def teardown_method(self): ("15-el8", "quay.io/sclorg/postgresql-15-c8s:latest"), ("13-el8", "quay.io/sclorg/postgresql-13-c8s:latest"), ("12-el8", "quay.io/sclorg/postgresql-12-c8s:latest"), - ("10-el8", "quay.io/sclorg/postgresql-10-c8s:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_postgresql_template.py b/tests/test_postgresql_template.py index 589f042..13407f0 100644 --- a/tests/test_postgresql_template.py +++ b/tests/test_postgresql_template.py @@ -20,10 +20,10 @@ def teardown_method(self): def test_package_persistent(self): self.hc_api.package_name = "postgresql-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "postgresql-persistent" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation(values={".image.tag": "13-el8", ".namespace": self.hc_api.namespace}) assert self.hc_api.is_pod_running(pod_name_prefix="postgresql-persistent") assert self.hc_api.test_helm_chart(expected_str=["accepting connection"]) diff --git a/tests/test_python_django_app.py b/tests/test_python_django_app.py index 3068021..9f6b606 100644 --- a/tests/test_python_django_app.py +++ b/tests/test_python_django_app.py @@ -20,7 +20,7 @@ def teardown_method(self): def test_django_application_curl_output(self): self.hc_api.package_name = "python-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "python-django-application" self.hc_api.helm_package() @@ -38,10 +38,10 @@ def test_django_application_curl_output(self): def test_django_application_helm_test(self): self.hc_api.package_name = "python-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "python-django-application" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation( values={ "python_version": "3.11-ubi8", diff --git a/tests/test_python_django_psql_persistent.py b/tests/test_python_django_psql_persistent.py index 5f23c76..4e6a2d0 100644 --- a/tests/test_python_django_psql_persistent.py +++ b/tests/test_python_django_psql_persistent.py @@ -20,13 +20,13 @@ def teardown_method(self): def test_django_psql_curl_output(self): self.hc_api.package_name = "postgresql-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "python-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "django-psql-persistent" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation( values={ "python_version": "3.11-ubi8", @@ -41,13 +41,13 @@ def test_django_psql_curl_output(self): def test_django_psql_helm_test(self): self.hc_api.package_name = "postgresql-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "python-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "django-psql-persistent" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation( values={ "python_version": "3.11-ubi8", diff --git a/tests/test_python_imagestreams.py b/tests/test_python_imagestreams.py index 023c281..f386ee3 100644 --- a/tests/test_python_imagestreams.py +++ b/tests/test_python_imagestreams.py @@ -26,16 +26,12 @@ def teardown_method(self): ("3.9-ubi9", "registry.redhat.io/ubi9/python-39:latest"), ("3.9-ubi8", "registry.redhat.io/ubi8/python-39:latest"), ("3.8-ubi8", "registry.redhat.io/ubi8/python-38:latest"), - ("3.8-ubi7", "registry.redhat.io/ubi7/python-38:latest"), - ("3.8", "registry.redhat.io/rhscl/python-38-rhel7:latest"), ("3.6-ubi8", "registry.redhat.io/ubi8/python-36:latest"), - ("2.7-ubi8", "registry.redhat.io/ubi8/python-27:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -55,13 +51,10 @@ def teardown_method(self): ("3.9-ubi9", "registry.access.redhat.com/ubi9/python-39:latest"), ("3.9-ubi8", "registry.access.redhat.com/ubi8/python-39:latest"), ("3.8-ubi8", "registry.access.redhat.com/ubi8/python-38:latest"), - ("3.8-ubi7", "registry.access.redhat.com/ubi7/python-38:latest"), ("3.6-ubi8", "registry.access.redhat.com/ubi8/python-36:latest"), - ("2.7-ubi8", "registry.access.redhat.com/ubi8/python-27:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_redis_imagestreams.py b/tests/test_redis_imagestreams.py index b82cd4d..a4ba364 100644 --- a/tests/test_redis_imagestreams.py +++ b/tests/test_redis_imagestreams.py @@ -22,14 +22,12 @@ def teardown_method(self): "version,registry", [ ("6-el9", "registry.redhat.io/rhel9/redis-6:latest"), - ("6-el7", "registry.redhat.io/rhscl/redis-6-rhel7:latest"), ("6-el8", "registry.redhat.io/rhel8/redis-6:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -46,11 +44,10 @@ def teardown_method(self): @pytest.mark.parametrize( "version,registry", [ - ("6-el7", "quay.io/centos7/redis-6-centos7:latest"), + ("6-el7", "quay.io/c8s/redis-6-c8s:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_redis_template.py b/tests/test_redis_template.py index b628174..ad28b60 100644 --- a/tests/test_redis_template.py +++ b/tests/test_redis_template.py @@ -19,13 +19,11 @@ def teardown_method(self): self.hc_api.delete_project() def test_package_persistent(self): - self.hc_api.set_version("0.0.1") self.hc_api.package_name = "redis-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() - self.hc_api.set_version("0.0.2") self.hc_api.package_name = "redis-persistent" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation(values={".redis_version": "6-el8", ".namespace": self.hc_api.namespace}) assert self.hc_api.is_pod_running(pod_name_prefix="redis") assert self.hc_api.test_helm_chart(expected_str=["PONG"]) diff --git a/tests/test_ruby_imagestreams.py b/tests/test_ruby_imagestreams.py index bfde639..c3601d2 100644 --- a/tests/test_ruby_imagestreams.py +++ b/tests/test_ruby_imagestreams.py @@ -25,14 +25,12 @@ def teardown_method(self): ("3.1-ubi8", "registry.redhat.io/ubi8/ruby-31:latest"), ("3.0-ubi9", "registry.redhat.io/ubi9/ruby-30:latest"), ("3.0-ubi8", "registry.redhat.io/ubi8/ruby-30:latest"), - ("3.0-ubi7", "registry.redhat.io/ubi7/ruby-30:latest"), ("2.5-ubi8", "registry.redhat.io/ubi8/ruby-25:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) @@ -51,12 +49,10 @@ def teardown_method(self): [ ("3.0-ubi9", "registry.access.redhat.com/ubi9/ruby-30:latest"), ("3.0-ubi8", "registry.access.redhat.com/ubi8/ruby-30:latest"), - ("3.0-ubi7", "registry.access.redhat.com/ubi7/ruby-30:latest"), ("2.5-ubi8", "registry.access.redhat.com/ubi8/ruby-25:latest"), ], ) def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() + assert self.hc_api.helm_package() + assert self.hc_api.helm_installation() assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/tests/test_ruby_rails_application.py b/tests/test_ruby_rails_application.py index 7b7cbb0..fdda100 100644 --- a/tests/test_ruby_rails_application.py +++ b/tests/test_ruby_rails_application.py @@ -20,7 +20,7 @@ def teardown_method(self): def test_curl_connection(self): self.hc_api.package_name = "ruby-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "ruby-rails-application" assert self.hc_api.helm_package() @@ -38,7 +38,7 @@ def test_curl_connection(self): def test_by_helm_test(self): self.hc_api.package_name = "ruby-imagestreams" - self.hc_api.helm_package() + assert self.hc_api.helm_package() assert self.hc_api.helm_installation() self.hc_api.package_name = "ruby-rails-application" assert self.hc_api.helm_package() diff --git a/tests/test_varnish_imagestreams.py b/tests/test_varnish_imagestreams.py deleted file mode 100644 index f1f21b7..0000000 --- a/tests/test_varnish_imagestreams.py +++ /dev/null @@ -1,59 +0,0 @@ -import os - -import pytest -from pathlib import Path - -from container_ci_suite.helm import HelmChartsAPI - -test_dir = Path(os.path.abspath(os.path.dirname(__file__))) - - -class TestHelmRHELVarnishImageStreams: - - def setup_method(self): - package_name = "varnish-imagestreams" - path = test_dir / "../charts/redhat" - self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir) - - def teardown_method(self): - self.hc_api.delete_project() - - @pytest.mark.parametrize( - "version,registry", - [ - ("6-el8", "registry.redhat.io/rhel8/varnish-6:latest"), - ("6-el7", "registry.redhat.io/rhscl/varnish-6-rhel7:latest"), - ("5-el8", "registry.redhat.io/rhel8/varnish-5:latest"), - ], - ) - def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() - assert self.hc_api.check_imagestreams(version=version, registry=registry) - - -class TestHelmCentOSVarnishImageStreams: - - def setup_method(self): - package_name = "varnish-imagestreams" - path = test_dir / "../charts/centos" - self.hc_api = HelmChartsAPI(path=path, package_name=package_name, tarball_dir=test_dir) - - def teardown_method(self): - self.hc_api.delete_project() - - @pytest.mark.parametrize( - "version,registry", - [ - ("6-el8", "docker.io/centos/varnish-6-centos8:latest"), - ("6-el7", "quay.io/centos7/varnish-6-centos7:latest"), - ("6", "quay.io/centos7/varnish-6-centos7:latest"), - ("5-el8", "docker.io/centos/varnish-5-centos8:latest"), - ], - ) - def test_package_imagestream(self, version, registry): - self.hc_api.set_version("0.0.1") - self.hc_api.helm_package() - self.hc_api.helm_installation() - assert self.hc_api.check_imagestreams(version=version, registry=registry) diff --git a/varnish-imagestreams-0.0.1.tgz b/varnish-imagestreams-0.0.1.tgz deleted file mode 100644 index 5dfa59d1468d6f899a453005df088f29b25a4e70..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1028 zcmV+f1pE6RiwG0|00000|0w_~VMtOiV@ORlOnEsqVl!4SWK%V1T2nbTPgYhoO;>Dc zVQyr3R8em|NM&qo0PL92Z`-yL$Nj9o;@;cbB^t?XG3F)aWSt=_ZFEtfabb<67`%kV zaU9R4)8;ddebQujNz$P>2~hJ7WGq)Qh2?30T6aIjVH{3^j4U%;yJqRW;1-yYj-&%_q0wrk zMvy6x%0XobxC1V|2U*4Z$#B=<0REoKA^f5Yl*$lr`JhbMBnNPzs!j0TA>@)w0APur za8BDaigNCXY7sJ3MwSU>@@UOhcOnXd$7(@c%){6Jn}nxv7!QLs(N7T>SXCKDHVwvm z?kY%>g8Z%(pg#{rpej+4O9i|I>J$ zBuD=L3G36?JoYyG%SrIaWtPIV-@9uHAt=dVh7Nth*y$etTgNkQwZMAZR`wTL$E#H} zo&*3}Fa%Z;^ZHF$H}{M`zuMbY^LRb()&cIEXZj;8K>M2Z?V_YonHsEWmMt0Y3}i|U z9Td1Ea0-|qbOf#-uvk)0a4iLDNd{16t1mfn2};84)#VMG@9QT$vC49pgY(^P1#SBr zBjA#WD)YO)Ym#?9wZ8vYo{?#zANd~C)B2ijv=C|$~xpg=uz)q+dp0vCdOPP-J0dTN^tmH4MJok)9&4ZC0EOvwv@)~3zZ@v<8Ytv#!D zZ<+{Bo)*(aE&YRyw^fI$AvJ<)$--fG)?%pz-I7)*48P(z!<@UGN~N_j&TcST@3hll zxHBHsCm)O|H$;8L|2^j2W*f$AOyYdCX6S(oNk;FL;H=*0xLQ*RH;SPM`iI+>KP0B- zhsE@)&-4qTFxvw|o2Q=v27vC5rr~TKA#W9XB-3!RgU8TN&aE?bXecYN$$=>>6P?eq zu_;K*)0Tzdx1zLm@IW{^u-W*-I66Oaw1*=S=NpcmOVDPL9SB3mS#+F5|H@h9Ntz!L yNe4EKlJ7)P@}HYV$@iK@$#WS>nrZZ-|3!4PqaE!hwZ8%Y0RR7$9tkx78~^}k6YvNC From 7ca13c786574d62bc8437588605d376a5e576f60 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Wed, 31 Jul 2024 13:02:26 +0200 Subject: [PATCH 2/2] Update redis and postgresql imagestreams Signed-off-by: Petr "Stone" Hracek --- .../src/templates/imagestreams.yaml | 18 ----- .../src/templates/imagestreams.yaml | 34 ++++++++- .../src/templates/imagestreams.yaml | 68 ++++++++++++++++++ .../src/templates/python-imagestream.yaml | 32 +++++++++ postgresql-imagestreams-0.0.2.tgz | Bin 1540 -> 1624 bytes python-imagestreams-0.0.2.tgz | Bin 1026 -> 1071 bytes redis-persistent-0.0.3.tgz | Bin 2679 -> 2679 bytes tests/test_postgresql_imagestreams.py | 5 +- tests/test_python_imagestreams.py | 2 + tests/test_redis_imagestreams.py | 4 +- 10 files changed, 142 insertions(+), 21 deletions(-) diff --git a/charts/centos/python-imagestreams/src/templates/imagestreams.yaml b/charts/centos/python-imagestreams/src/templates/imagestreams.yaml index 7fc4417..49b9097 100644 --- a/charts/centos/python-imagestreams/src/templates/imagestreams.yaml +++ b/charts/centos/python-imagestreams/src/templates/imagestreams.yaml @@ -99,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 diff --git a/charts/centos/redis-imagestreams/src/templates/imagestreams.yaml b/charts/centos/redis-imagestreams/src/templates/imagestreams.yaml index 1507411..87dac0d 100644 --- a/charts/centos/redis-imagestreams/src/templates/imagestreams.yaml +++ b/charts/centos/redis-imagestreams/src/templates/imagestreams.yaml @@ -31,7 +31,7 @@ spec: using this database image, including OpenShift considerations, see https://github.com/sclorg/redis-container/tree/master/6/README.md. iconClass: icon-redis - openshift.io/display-name: Redis 6 (CentOS 7) + openshift.io/display-name: Redis 6 (CentOS Stream 8) openshift.io/provider-display-name: Red Hat, Inc. tags: redis version: "6" @@ -41,3 +41,35 @@ spec: referencePolicy: type: Local name: 6-el8 + - annotations: + description: >- + Provides a Redis 6 database on CentOS Stream 9. For more information about + using this database image, including OpenShift considerations, see + https://github.com/sclorg/redis-container/tree/master/6/README.md. + iconClass: icon-redis + openshift.io/display-name: Redis 6 (CentOS Stream 9) + openshift.io/provider-display-name: Red Hat, Inc. + tags: redis + version: "6" + from: + kind: DockerImage + name: quay.io/sclorg/redis-6-c9s:latest + referencePolicy: + type: Local + name: 6-el9 + - annotations: + description: >- + Provides a Redis 7 database on CentOS Stream 9. For more information about + using this database image, including OpenShift considerations, see + https://github.com/sclorg/redis-container/tree/master/6/README.md. + iconClass: icon-redis + openshift.io/display-name: Redis 7 (CentOS Stream 9) + openshift.io/provider-display-name: Red Hat, Inc. + tags: redis + version: "7" + from: + kind: DockerImage + name: quay.io/sclorg/redis-7-c9s:latest + referencePolicy: + type: Local + name: 7-el9 diff --git a/charts/redhat/postgresql-imagestreams/src/templates/imagestreams.yaml b/charts/redhat/postgresql-imagestreams/src/templates/imagestreams.yaml index bf51202..b4c45bd 100644 --- a/charts/redhat/postgresql-imagestreams/src/templates/imagestreams.yaml +++ b/charts/redhat/postgresql-imagestreams/src/templates/imagestreams.yaml @@ -26,6 +26,74 @@ spec: name: 13-el8 referencePolicy: type: Local + - name: 16-el9 + annotations: + openshift.io/display-name: PostgreSQL 16 (RHEL 9) + openshift.io/provider-display-name: 'Red Hat, Inc.' + description: >- + Provides a PostgreSQL 16 database on RHEL 9. For more information + about using this database image, including OpenShift considerations, + see + https://github.com/sclorg/postgresql-container/blob/master/README.md. + iconClass: icon-postgresql + tags: 'database,postgresql' + version: '16' + from: + kind: DockerImage + name: 'registry.redhat.io/rhel9/postgresql-16:latest' + referencePolicy: + type: Local + - name: 16-el8 + annotations: + openshift.io/display-name: PostgreSQL 16 (RHEL 8) + openshift.io/provider-display-name: 'Red Hat, Inc.' + description: >- + Provides a PostgreSQL 16 database on RHEL 8. For more information + about using this database image, including OpenShift considerations, + see + https://github.com/sclorg/postgresql-container/blob/master/README.md. + iconClass: icon-postgresql + tags: 'database,postgresql' + version: '16' + from: + kind: DockerImage + name: 'registry.redhat.io/rhel8/postgresql-16:latest' + referencePolicy: + type: Local + - name: 15-el9 + annotations: + openshift.io/display-name: PostgreSQL 15 (RHEL 9) + openshift.io/provider-display-name: 'Red Hat, Inc.' + description: >- + Provides a PostgreSQL 15 database on RHEL 9. For more information + about using this database image, including OpenShift considerations, + see + https://github.com/sclorg/postgresql-container/blob/master/README.md. + iconClass: icon-postgresql + tags: 'database,postgresql' + version: '15' + from: + kind: DockerImage + name: 'registry.redhat.io/rhel9/postgresql-15:latest' + referencePolicy: + type: Local + - name: 15-el8 + annotations: + openshift.io/display-name: PostgreSQL 15 (RHEL 8) + openshift.io/provider-display-name: 'Red Hat, Inc.' + description: >- + Provides a PostgreSQL 15 database on RHEL 8. For more information + about using this database image, including OpenShift considerations, + see + https://github.com/sclorg/postgresql-container/blob/master/README.md. + iconClass: icon-postgresql + tags: 'database,postgresql' + version: '15' + from: + kind: DockerImage + name: 'registry.redhat.io/rhel8/postgresql-15:latest' + referencePolicy: + type: Local - name: 13-el9 annotations: openshift.io/display-name: PostgreSQL 13 (RHEL 9) diff --git a/charts/redhat/python-imagestreams/src/templates/python-imagestream.yaml b/charts/redhat/python-imagestreams/src/templates/python-imagestream.yaml index 2c3f19c..7d463f0 100644 --- a/charts/redhat/python-imagestreams/src/templates/python-imagestream.yaml +++ b/charts/redhat/python-imagestreams/src/templates/python-imagestream.yaml @@ -24,6 +24,38 @@ spec: name: 3.9-ubi8 referencePolicy: type: Local + - name: 3.12-ubi9 + annotations: + openshift.io/display-name: Python 3.12 (UBI 9) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.12 applications on UBI 9. For more information + about using this builder image, including OpenShift considerations, see https://github.com/sclorg/s2i-python-container/blob/master/3.12/README.md. + iconClass: icon-python + tags: builder,python + supports: python:3.12,python + version: '3.12' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi9/python-312:latest + referencePolicy: + type: Local + - name: 3.12-ubi8 + annotations: + openshift.io/display-name: Python 3.12 (UBI 8) + openshift.io/provider-display-name: Red Hat, Inc. + description: Build and run Python 3.12 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/3.12/README.md. + iconClass: icon-python + tags: builder,python + supports: python:3.12,python + version: '3.12' + sampleRepo: https://github.com/sclorg/django-ex.git + from: + kind: DockerImage + name: registry.redhat.io/ubi8/python-312:latest + referencePolicy: + type: Local - name: 3.11-ubi9 annotations: openshift.io/display-name: Python 3.11 (UBI 9) diff --git a/postgresql-imagestreams-0.0.2.tgz b/postgresql-imagestreams-0.0.2.tgz index ba21f5f6ee9bdb64672e7ee48fb78fe757aa4124..dfea7f0007abecc48a22bd19b174ecd09b10deae 100644 GIT binary patch delta 1584 zcmV-02G99~4A=~iJAYbjZ{xTT&S(CL0k(j50b7z^H*25=p~ z#S6tzNy<6**B7L0Sx)S1a&eLtFh9hxq#4f3^E?VTDag8+LHlpjkvX5Cbq0BEk|Y@o2H`VFlDnVD$B%=f?qD?R4gAl+QPLeHAAd(jkUW3u@2}E2ZjO>? z?{zo1|C7bFCdZv5ZO05i__o`K3e+}}Qx{2!HP3Mj7ns5q?%-Pmn9IMNL&_bWaEoBk z%%wnRA_(5&?*$r}qjp?1vT_m$%3~`OnOWQ*Rc#bU?53PxopkGmKX;>E5+yBG6?g{|nWfSQ zv}4wJV8;wq-l>|$9G}^7opO8am(4dT?)$%s{|@s)aes$4-YC@{5`>5O-|ckhla1OH!R-AJ8|;mr5=GW2+ZsG;|pYB2Az93A)Y@`7;}yA0rtqyTK#r_vURFFKWB zgQd1W;hzui4R)QS_kcqeE^YDt=pEqwd2sY$yIEmqE>kp}P5ahTP}*>&MbxToH{|Mv zPJJEVTYu%q0^cf@q~YSr>G?yd({NT=sb}E49M&E}SK1)8P-W_G|5Bj7^m%xVvObBb zK<%Yct=1D2Yocfp=iE9p@x|%M=f9ptc^Wa+@c56Di?3&2|1yRj7hqALaCNwj&)Tq{ z(f}_CB}J9rtyBtl>B#3RxKfK|vPH@rf}^1AE`P&i>tQKeK+|SP`J79|Co0smu0gxu za9yID|3;?vQ*C6U`cWxJ|D?FJ zsE(Hx4NlRZ7Wj>n6pOVZwZ-1TF(OJ@g9MB{J#Ut;{z~X5tzq&2Ig>2iaC5^#T*_K^NGM5zNBIf_X5m)DCY2u z6>|$P4~qGkz&zeFF#CH_%>ElIX8)j=Pk#hv|0NZ(zZYQcLoxerte9JXc~H#P1m^Lc zf!W&=Fnezd%-#W*PXuP~C4t%dBf$Lr`R}gt|GHp%IAi|K{I53}_V3L9hJ)T={`V^D zU6b=)P~{LNzZ(NG#;!7isZ_X{fmz^6fh~)IjKj3)V`E&z*aM@r%!pbbjiAf#9*T6mS>It5QVsb>*m@7}=|y7gW?YFuUB$YWJ0V;!V) zs}=DyxRBa9UoxMT7g43?He58-+<(%7Pf(J^6n@Rn;QcgH5;m6F8H$(QLgwp`ZpqwK z5jEPe4vw)Oaq2s0C3?y6xx?SJDrFO6v%u6O8DXP!h!)PIfK>_68a z_3~XK4GKqQ5mkNA_`3t^umBm5P!^#d4U{*tj;f)v_w&e{R!!Xz%9l(lj0dk;w84~m9pSwINx%%l=)6PlnAkQZ> zN1*W630yBDzK%j^!Y(vjRlDNtluLzaV6;JQNeABEt3w>asWD{6aQ5}`>g4?V&M768c888W0!9sA iJN^YApyUxR^TRrnJS0? delta 1499 zcmV<11tj{|41^4jJAYVfZ`-&M&1e3K0eS(afUSq~HgF51ZF&>R%BlC)FG$(4oW$uP>0=k>m&CMYIFECV#VN_Uu|fN%>dAtS(K>^?u<@&$8y8J^ zp*9}9k|arXx3|OJBuQ@nP4@P-H`49hoqoEvyO(ZnB`+igT8YMaZEizLOG7dU`(%;1pgH{j;iR@&0~&_?Vw4yyYR~<%N6(iU&ViiMX9($8-FjA>Z=6d6a3%V+3PR!zn|`; zdu#rGk993|Hh>e~AGePOXi55|(v0aj@7rka5 z;9c#=0)M|(EJ?%p@zLo+s?%~-S*ge1yc{+jLRY#VwNO>&zkXYyzVLZ?jj}$8x^ee@!9fW^-OMtFdEvub-baf7jk)dLN$ve!t^~7O`#%_%{WUPZ5SaaM3C#Z20P{z``PXaJ{jX`t z6P)ph`(J-|XY1DdXJ>nBJ^%SG>seb@j(<@V5GH?10}{qAbA*vpIG=%7;7Wn5%94!3 ztnFiIT)@}^qm|sBR?jTFn1uIz8jbv|0NyV`v7Vk)nEiO;KQ`x5%!FvedgsKevXra8FbyN=> zy`Rs_Y2MToF|OKg#a`FqL<5-&O{jK`;u_=#aDry)a^EH&RWV~)X*_tU(+R%F2ajJYIMf2s(?j1$jQC2?B*TAh?=Ed=-V#gi~lVuXfGb5tjQZ@Ko~T?HRl|JUKmjJ@7GUa$vAmS&u*uItVqA7OeAik{T+D zp?GalRJv)t!HJ~GuF%oXfKkiWiV<)?$xrgauwLu6UjLf)cK`qY|NkaV#(V%C001-} B@y`GN diff --git a/python-imagestreams-0.0.2.tgz b/python-imagestreams-0.0.2.tgz index 353e01c421dc3ccaea81160e50645f22608e4511..a2210177f1c2a169f2754598b90c8ca0a312b656 100644 GIT binary patch delta 1026 zcmV+d1pWJh2(Ji`JAawqZ`(Ey$MdYe;@*-1)(U00;t_Do9`n+-)0 zB$d^`{`i5CBUp)JtdZixsPDxI={x?o&wY=8)zU7c@L5IYXskwBnegp`Y8xzR#g9g@ zD2k$FI&D6qD7yPeqG@zQrpZ}6J$*ern;u2vERNzMh{jodyMNWjQhgK+UhD4R_Qa?V z(o)N$Fu4a%xYV0KDimhHu57?$C}@Q_Tw)2oQ460MV1O#cS0; zEak5}s@Pws4U-~=o7kgDb^k^|6vSSMrqE2;X6Va;87QQ%C@e4oO{_N51WE})TBr>I zv%mx>Ez7!ao__(H*Nm4yMG3kV9&FiR0KZ5LmDC7KTuEIuvp{FEcEOpLgLT`OxrnHt zsfvjQz(m38(#`*&P<(bbS;hfn;Jqrq1g{I(A&qEV4e^qPl zkdz73;f%{!SW#n9ho=D{;pO``?|y$DRAt~@*E8(y>woy?pGXi#L3Hf3+1OCFo{_aK z(Bz)KWgiRVmEUIBvvh9q+rv)Uklsx{N6*dY!JgJO>A%HFaca?o_h%o|7Pjj@nNG=B zU;ktBI!O-tzYFty-@9g_%;CZ%`E!%xo^&_K?{|b7;#FvANiB6vV_lLwfIBS(pyyjM zqc~mqt$$Oi)t*sUxbHTK-Avkh%- z^TP@$-g0V8-u&rzC_3BN<=QDzD|C?Q*M$oK zCx7nEmW^5)8w;XYY}0!&+gukNgfF5#NW5Mk4Dc5&TBdnuVlEsl3nU6*<*br zPs=OW!Yg@hUf1-M4B#~zjBB<-TC@FyHG6wfRt=4vse?d*26x8HlP?MJfYVw_+KKG9?2Rqoo4z@%4F8~1l|9oK|AOI!+065(NwEzGB delta 981 zcmV;`11kKl2!aTZJAasOZ`-yL$NgBZ;+`c1tbdN9NCJL8plQ1;K-U#%w>_q%v&@Df z36k<^U@v|kWeZl~7;Eh~@#=fxg!CQ%+~>YWST4*=aG%zsLTwb1T8D3DM44bgYBt!5 zMNt$b5H*N)UhDqhj>HJ( z!Vp6R*SQB!*wpJlNaT7(rzW5x)~1tYIST_`Gz8~Qw>8VbP;asyO@i`9l2LMea?1C2(Y z1}F!qMA;P9Gk<{VhO!a}FF`fjgDpD@;3uJ=77Bs#sZh0>1u_wh4NiFl#%^O`BccLV z6+;hz@`5#`o&QZD|735*?p4zgRlC9vG$PE5kvb245@U!I_$6w>CO8&dTu^X_O!N1{|(lX5raB>IQuw-0rlZifAP=Jci@0$9-UWEI$w4YHxBBh(J(qoM2sgY4 zmVUiP^|!wqg?{JRd*3-s*U8qKPIt0DU*CSX`S5cN*9*|durS>w4XK8(5RFbg)({#UN=l?$?z7X$hX{W`GxRG`1m!bXp87niF(E6 zgPQtGs^wJ6*+r1~&4i|IP~j96@&Z2!MvKKNh*?O?;k_sbTPq6tQn0Ss_t%9D0q6G3 zmVfQFHZ~T7TWr&NG22`h9fU8UKKie+{qmOE@cplJ&#yB(ceZyT--_Z6mE*F9qr!@6 zqZWa}az-2k7O~X};3AImH8K81UbCHX%??OwcD%4=Ps(ccII7vpAvN0p)K*y2eF$s% zjKZ281FJu@u%>$y)}3(84oK@}VLb|1e@CT|02Lv@eUQp8~1vPyf)b!03ZMW Dncdx4 diff --git a/redis-persistent-0.0.3.tgz b/redis-persistent-0.0.3.tgz index b5214c03ee81f15612bb63856e39c35f4a0d28fb..331c7853def14ff112677bd89d1fcbbf5b05c607 100644 GIT binary patch delta 2611 zcmV-33e5HQ6!#R6O#+Ftkxv$XNF7PJapQdV14&s=cAna9ire+PXe?4BhclcXXGT+j zF_m71LQ<)asm}g{2<6X6nmqef6a+!g-`+NVgCJ=C?e@0%&$`?Fo!)kDs~2oP3%c7o zLH8L1-;9GhD3^+eXTevm)!y9y2oc7(B8qY*LkA$z+Lu1hkjV)hDWCFx4kIasaDp-X zOqBjhB~a$2m~t_Lm?#2Li9AxdK#+}JglW$qSyny9Tg+wu>5nj~H+p$1-kr%V>fr@qd?`ef1jm*ncnB-fh`` zzZdk^_Wu-gZCo?=h1Itkf~#-uu+!0+_li@XuWtMExw~n92dG(w`fWb^9V4}9%>>U- zD2mbz!A@=3SE5YgmByq}3ChOBq-AeLltRJu3;#YN-six3?OmMz-wU^V?WP*xmN<3q zGAoBSG3d+YXhGCt_p7K%O!uJj=6*3#!YTcX?bo$S>V}|1j;$VnEJk4#O0?(M9%)+- zsTOT_bsxEZ(tSa&viF~iDn0u^qPYvhZCa8Mi}DB=z~+aDr>oo??ADfD-Cw)%I< z;qVqYH14s-3ZfPT>6cD3jOb`)?_i)Q8KYDJNeYTAjYXDgv7CXceS4|gO>p%s`g-x> zhsBRw7tSl*9sBQ%v%XmWth99hFCswMi7`v~Oo!HgUl|SDbN_Gc_Ij=Rf4AQY*7yHY zP(AxXvP^cSUFRcZaR>*c`kfRN(N}or0JIWDP^An=l1)f6b@Yi)<&C)T1d@0bf~%3) zf}??~=G#ip@fd{+VeS+&{#;2Cai+}gOC&BpQ+lXyVX#K3iikzWeIJeBDhc@~`eW~XioRl(qFLWY>M2yEH|ft8$`lOMf&>2$Jk&{-dN81fit3f+U;J$cSWMLBu-UPb6T|e*xzY89L7tJ#T8D-;F zF1&dI?%??7oqL}mb{-^Kfn|ENdfj+`z_Phj>l`Ue?bJHGgpbQXHbgq) zIcuJiRJRo4r$lrTI<%?qj<%p0KM%GruQo7da$!sRHVOU{6>?!q0<}w^7H{l-C7;M_ zaioiEdWADzv_8}l^fsc~PY7**Pox`;9uD@3sNCx6argfn{$JH-cWqeu5?AoP{O@+q z^8b3hpuf)lJP9?vzAaq8!K%~Q@B*L0aUoHJQXcZy+M5R_Na9}wRd~!Ibe2$2;D2(I z6^<0&?HY@=QZjnE@2!FFOLy3Rzx95;!Iz+W?SE^ho&VkKZLRJ9DQKnrpBl|SFzjoD zaCnvRnmZiA##6n||X3F<30u6WCzmetF1HgUu zzq?fbv)c`NYx{o+y2bvD=Dz{}azP6d4m+LeA}eBD?e~M5uxK&i;o0ARUi#Wx-@LIY z8TZw>>9~0!H=~SEy`>PA@fdBOYQyDLM7$iXDk8?H8nJCN;qs{L3QDb)z0pWVj(*Vf*&fy876Eo?wDRqJLCGwbhw0)gNy0c2Oa+G{m$Qxz!~^aVMChzMOO> zoPTs}*+>fn9&g^yi;lf0;yF`|!Obpfb?s#00u|i04V3$ZTG~$Fm`WvP+L@RTgNR~+ z$qz*xUq389z}1J{liK@&OlBeY+x!~0%$v57WksTFNNTAv4?K*2YEN#FrGoAbG}2-Z zP|9ryGuK(lx*XvY#b3bz`_8n4|0i$v4i4Y?Y5eWhxCj4x+x>R@w;gP+@&8Hac~KUv zq1RS_JI)^bTt1nKykSlgQ^ibJ4ED3Id4e-D`21zF;`f%?H?L@F+K>;Cgh$)#6%t< z=e7lpxwO1QoQ>!>7eyVm*{<(6b2|+@jOK7qRf(78wKe%7SsDMhf8zZE;U1T z?dH9=deL(2!Qy&cOl{4gy6&~6gkA^c@b)Sb);Tw)AcV^^;(gxp{uOwy&#$}vo69-} z#TVr}8Gt!|6mFQ_{7F^RqtC{$I3_Pmsm>;F0oILpW%g}aFAZmU(bE08d%;TNm6$6J z?b8H>wY1vDbbUwD7-c2x6~(`r5yMCQyVE_a%;At+(KJtim=8Z%21S{dW}!q7h=|dH zVPL1%J*3sPTbbRvR-7-&=)=FapQdV14%vGd1|{UZrAgou}F~|&TxL58BIBc zR5&SeL50LbcJ^n4OLsxy=-Ia-&-1+9eqaCfJg@z?+uPZF*6k05y}@p;-`#oUb^C*^ z_YAym#=#ww2}$@f@2l5pZ|;ADNRlu~BxQ;4Er392U$`vAM9kEQ5JkXgDs|J=hZz+RutZG@RDhn$%(V?6gM>-Q1Ok;n6G%A= zvp@}X+nihQFy0HkUHFNAaflg5pvi>sSW6Aam}P23noKPKskoCErxB634KxX&ETqX4 zj#Erdl|&Wqf`-VA(6>P#!c59k_?^y_%2_sc0~U8g5HUXO82eQFB{V_a8Aoi~iHVTN zI|CQs==j51rMTZ%25}}N%*Y(;+|OB*#VCNx3601&QryFWWgLQkC{xpbWLjVi*4-`Z zV>ZT86I=iPrt9`R*W0qpacJX)C0ND-6u#x$v6~r2v187dCCOCyS_NYwa9dAk&6}$K z-q!KwrxpC4lPE*+O)r3Z@Za0%uHgT$-{0W>Q&3@l7Xta526$03Z_5DXMMPsNeHe6m zhg6%tNJ+2;100EeLMj~89TzDP;uGVc52`(d=kVe9;Mg}X72<>@2t@rLStLQ9JD4yI zZgconK3xe7yADP_SO(WF0+Nz|%7qWzcXWdnkEYw~Uj#FZiTk@?$ycv&kNx+&{;*~L zyS?sUWB*S<*V;9+Ul@JcKG^E^_B$P=c_%*w>gqN>pWEAiW`JCzsNQDd-!YIyYsy)Q zTv8Oa4`yoJz7}N~uQVnVlG9|GPg?e-L`vj|dg0$^#QE$wubqqY|9fGVuiaE5>=LK$ zU1sg@CI)@k94&}??0zMck?tN<-rO&GN;svTvHiMoNo^k_&#=|QF$t0Dg(Bs7wnv)Q zL#jmEUEfE4u2i4rt?m71LZzDh9bGSn`Ze;!LO95e5ae-(ne7je!Jyl_Lkhct!OrfT zayYz24vl;4v4W^YLF%Q`6azY0m^&C~Or|I#M-qc1D`PRqlvvKdR=&NE_BPn+7JXg( z_@VeQwBfws-7^2)SeuLW&q^!ze-QzSPKas57AmxV{>o_Jp8J1i*z2|K|KVuYd- zF)nX^1D@gL#;%RK*={UPF$zaS&NN)77`UYn^i!Fx5og}Ht9NR*P!%-JMr4dpOO9*f zD$`{FnDDH|^;*{oZf-2aiJF;X8qt6VAG#KRzz74$xLGqMGMN3N#>8V501%QBiPJ^C zfkmqGgaJpxYq=w{R_zceiW1aThHPU^1_!cJj$j-X6R^y%_DCp8k4# za!}K#4tjp#EcP2`MX0^VzvJQrC(Ry!kGQC^S5Dz5wqAPNo=UUu!3Mk8G|HlA#3C9j ze0V=OVsgY$6q!{mPCCZ~g&1)*#yYb!p^}p503)(E#egND@L|WRy&;42lm#DAHuso+ zGA@1C-5I{Fze{6enJg#jw)AHb2lXjLT@R(IM(ZX|Ig>14kq;mCM`gRh4!U-0cvT$& zLjj9pl7!7h2RdV#bi}OH>ds#Uajnr?;{Hr=Yd=f2uYAz_70o z!r@iQYVNQPTi4pq&$hN!eC4gJ^P8Vs z|8S-LXV~p_H}?M&bc_9K&3^>|WSr(E>~}iXc~-=@+V4jykizIkI( zGWM%;-Es3oZbliSIx8V;!a_8GstK1{5%FrcDhZ#WY{a(Bgv+C{D=3s+_9hb*IWBxS zVu?HF1Whs3qcGtf`(Lg9>+N`( z{O{AydjFq=4cj-T)>g-V_5>p&0^OrLs;$n1uKuv|xAO{-l_9!4&#kT?iao<9cEzkS zW9*}C%0^ls@Oblno_Fj80m~BE7~JeKR@Y7@7N}siZJ^vQ)Y5hwr&LJ3P|n1RXhh^Q zjDE=L_;&sL16+OBJ*mAf$Ykb%zs;|)%e-kTS(Yct#-x@ibHKrWp!Q_vSt{rbpph1P zfKqNtnAz4!*5wH2$o~os*mtHC{6BfScX0UDjl*xZ#y$Ao>+iPXzrNSs;Qy1*^Smrt zL9eO)wyZt)xqQ+UdE<;mx{8@3A(+p?`U%eT;PaQwir-smmtO%%^`|IZH_ei&Cfc>E zJ8G*d)`TvWmNNu@Hkr_Xk_gT;tNW(+fCZT@1y`dhu8M2rm1|kQu?!N#5F|6D(k9EK z9!Xgdt@ey0m;p=kI&D)FUKMfow;`e*u`Y}xguMRIwXEmQ!C;~FBS!2KPyqy_F280I zGq)*t%!J`3V9A6|GoIIB>+QOhwKUVf!)OTyRh5W-GPRX|OV|rTsv1cI?`r~HT1)3K zw1nCNs3&MNHF~WjT&}$dE^lG}!wmKHrbMKaT!}jmNWerFp;nN3qnO@>C0y#`cBvRL zYd7z`^^2BkkBaNDnA(^{b=@mXakUOC;q6t*jdQL~fe)8w#QD7E{L6D*pI>)(Z!YT` zJw?@sryvV=o&MdK_6qCfm78RTVNiiHwEARt-~ znt?&Ddq}How=%nTt+*`8=*(WL{~4ilua49