From a0e3b5c2873146c5f9aa158f98980794f5a12d2e Mon Sep 17 00:00:00 2001
From: "Petr \"Stone\" Hracek" <phracek@redhat.com>
Date: Tue, 13 Jun 2023 09:55:54 +0200
Subject: [PATCH] Add support for the latest postgresql-15 imagestreams.

Allow also testing them as they reached GA.

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
---
 imagestreams/postgresql-rhel.json | 35 ++++++++++++++++++++++++++++++-
 test/test-lib-postgresql.sh       |  8 +------
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/imagestreams/postgresql-rhel.json b/imagestreams/postgresql-rhel.json
index 19dd45b9..4e698ced 100644
--- a/imagestreams/postgresql-rhel.json
+++ b/imagestreams/postgresql-rhel.json
@@ -20,7 +20,40 @@
         },
         "from": {
           "kind": "ImageStreamTag",
-          "name": "13-el8"
+          "name": "15-el8"
+        }
+      },
+      {
+        "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"
diff --git a/test/test-lib-postgresql.sh b/test/test-lib-postgresql.sh
index de943a0b..6242ff3a 100644
--- a/test/test-lib-postgresql.sh
+++ b/test/test-lib-postgresql.sh
@@ -37,13 +37,7 @@ function test_postgresql_imagestream() {
   elif [ "${OS}" == "rhel9" ]; then
     tag="-el9"
   fi
-  # TODO
-  # Delete this as soon as postgresql image reached GA
-  if [ "${VERSION}" == "15" ]; then
-    echo "WARNING: Version ${VERSION} does not reach GA."
-    echo "WARNING: Remove this condition as soon as it will be available."
-    return 0
-  fi
+
   ct_os_test_image_stream_template "${THISDIR}/imagestreams/postgresql-${OS%[0-9]*}.json" "${THISDIR}/examples/postgresql-ephemeral-template.json" postgresql "-p POSTGRESQL_VERSION=${VERSION}${tag}"
 }