From 0e530d78e42a7ff32761baa3f6ad9cfb48c8ac19 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 10 Jun 2024 13:41:54 +0200 Subject: [PATCH 1/2] Add file show_all_imagestreams.py from container-common-scripts Signed-off-by: Petr "Stone" Hracek --- test/show_all_imagestreams.py | 1 + 1 file changed, 1 insertion(+) create mode 120000 test/show_all_imagestreams.py diff --git a/test/show_all_imagestreams.py b/test/show_all_imagestreams.py new file mode 120000 index 0000000..ba8fe97 --- /dev/null +++ b/test/show_all_imagestreams.py @@ -0,0 +1 @@ +../common/show_all_imagestreams.py \ No newline at end of file From 27df260025833614047e6a4d69ed7a849772fd81 Mon Sep 17 00:00:00 2001 From: "Petr \"Stone\" Hracek" Date: Mon, 10 Jun 2024 14:28:02 +0200 Subject: [PATCH 2/2] Add mariadb-10.11 imagestream for RHEL8. This fixes also RHEL8-OpenShift4 10.11 tests Signed-off-by: Petr "Stone" Hracek --- imagestreams/imagestreams.yaml | 4 ++-- imagestreams/mariadb-rhel-aarch64.json | 18 ++++++++++++++++++ imagestreams/mariadb-rhel.json | 18 ++++++++++++++++++ 3 files changed, 38 insertions(+), 2 deletions(-) diff --git a/imagestreams/imagestreams.yaml b/imagestreams/imagestreams.yaml index c49b9d1..1ca038c 100644 --- a/imagestreams/imagestreams.yaml +++ b/imagestreams/imagestreams.yaml @@ -21,7 +21,7 @@ app_versions: ["10.3", "10.5"] - name: RHEL 8 - app_versions: ["10.3", "10.5"] + app_versions: ["10.3", "10.5", "10.11"] - name: RHEL 9 app_versions: ["10.5", "10.11"] @@ -30,7 +30,7 @@ latest: "10.11-el9" distros: - name: RHEL 8 - app_versions: ["10.3", "10.5"] + app_versions: ["10.3", "10.5", "10.11" ] - name: RHEL 9 app_versions: ["10.5", "10.11"] diff --git a/imagestreams/mariadb-rhel-aarch64.json b/imagestreams/mariadb-rhel-aarch64.json index 4bc3c89..d950ef8 100644 --- a/imagestreams/mariadb-rhel-aarch64.json +++ b/imagestreams/mariadb-rhel-aarch64.json @@ -45,6 +45,24 @@ "type": "Local" } }, + { + "name": "10.11-el8", + "annotations": { + "openshift.io/display-name": "MariaDB 10.11 (RHEL 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "description": "Provides a MariaDB 10.11 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.11/README.md.", + "iconClass": "icon-mariadb", + "tags": "database,mariadb", + "version": "10.11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhel8/mariadb-1011:latest" + }, + "referencePolicy": { + "type": "Local" + } + }, { "name": "10.5-el9", "annotations": { diff --git a/imagestreams/mariadb-rhel.json b/imagestreams/mariadb-rhel.json index 0b24b38..83ea49c 100644 --- a/imagestreams/mariadb-rhel.json +++ b/imagestreams/mariadb-rhel.json @@ -81,6 +81,24 @@ "type": "Local" } }, + { + "name": "10.11-el8", + "annotations": { + "openshift.io/display-name": "MariaDB 10.11 (RHEL 8)", + "openshift.io/provider-display-name": "Red Hat, Inc.", + "description": "Provides a MariaDB 10.11 database on RHEL 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/mariadb-container/tree/master/10.11/README.md.", + "iconClass": "icon-mariadb", + "tags": "database,mariadb", + "version": "10.11" + }, + "from": { + "kind": "DockerImage", + "name": "registry.redhat.io/rhel8/mariadb-1011:latest" + }, + "referencePolicy": { + "type": "Local" + } + }, { "name": "10.5-el9", "annotations": {