Skip to content

Commit ac721ae

Browse files
phracekphracek
authored
Add missing imagestreams for Postgresql 16 (#553)
* Add missing imagestreams for Postgresql 16 * Add workaround for postgresql-16 that is not released yet. Let's test integration with postgresql-15 that is already released * Skipping tests because imagestreams does not exist yet * Fix container name in devel_images file Signed-off-by: Petr "Stone" Hracek <[email protected]>
1 parent af7b627 commit ac721ae

File tree

4 files changed

+162
-0
lines changed

4 files changed

+162
-0
lines changed

‎imagestreams/postgresql-centos.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,24 @@
2626
"type": "Local"
2727
}
2828
},
29+
{
30+
"name": "16-el9",
31+
"annotations": {
32+
"openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 9)",
33+
"openshift.io/provider-display-name": "Red Hat, Inc.",
34+
"description": "Provides a PostgreSQL 16 database on CentOS Stream 9. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
35+
"iconClass": "icon-postgresql",
36+
"tags": "database,postgresql",
37+
"version": "16"
38+
},
39+
"from": {
40+
"kind": "DockerImage",
41+
"name": "quay.io/sclorg/postgresql-16-c9s:latest"
42+
},
43+
"referencePolicy": {
44+
"type": "Local"
45+
}
46+
},
2947
{
3048
"name": "15-el9",
3149
"annotations": {
@@ -62,6 +80,24 @@
6280
"type": "Local"
6381
}
6482
},
83+
{
84+
"name": "16-el8",
85+
"annotations": {
86+
"openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 8)",
87+
"openshift.io/provider-display-name": "Red Hat, Inc.",
88+
"description": "Provides a PostgreSQL 16 database on CentOS Stream 8. For more information about using this database image, including OpenShift considerations, see https://github.com/sclorg/postgresql-container/blob/master/README.md.",
89+
"iconClass": "icon-postgresql",
90+
"tags": "database,postgresql",
91+
"version": "16"
92+
},
93+
"from": {
94+
"kind": "DockerImage",
95+
"name": "quay.io/sclorg/postgresql-16-c8s:latest"
96+
},
97+
"referencePolicy": {
98+
"type": "Local"
99+
}
100+
},
65101
{
66102
"name": "15-el8",
67103
"annotations": {

‎imagestreams/postgresql-rhel-aarch64.json‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,42 @@
2626
"type": "Local"
2727
}
2828
},
29+
{
30+
"name": "16-el9",
31+
"annotations": {
32+
"openshift.io/display-name": "PostgreSQL 16 (RHEL 9)",
33+
"openshift.io/provider-display-name": "Red Hat, Inc.",
34+
"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.",
35+
"iconClass": "icon-postgresql",
36+
"tags": "database,postgresql",
37+
"version": "16"
38+
},
39+
"from": {
40+
"kind": "DockerImage",
41+
"name": "registry.redhat.io/rhel9/postgresql-16:latest"
42+
},
43+
"referencePolicy": {
44+
"type": "Local"
45+
}
46+
},
47+
{
48+
"name": "15-el9",
49+
"annotations": {
50+
"openshift.io/display-name": "PostgreSQL 15 (RHEL 9)",
51+
"openshift.io/provider-display-name": "Red Hat, Inc.",
52+
"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.",
53+
"iconClass": "icon-postgresql",
54+
"tags": "database,postgresql",
55+
"version": "15"
56+
},
57+
"from": {
58+
"kind": "DockerImage",
59+
"name": "registry.redhat.io/rhel9/postgresql-15:latest"
60+
},
61+
"referencePolicy": {
62+
"type": "Local"
63+
}
64+
},
2965
{
3066
"name": "13-el9",
3167
"annotations": {
@@ -44,6 +80,42 @@
4480
"type": "Local"
4581
}
4682
},
83+
{
84+
"name": "16-el8",
85+
"annotations": {
86+
"openshift.io/display-name": "PostgreSQL 16 (RHEL 8)",
87+
"openshift.io/provider-display-name": "Red Hat, Inc.",
88+
"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.",
89+
"iconClass": "icon-postgresql",
90+
"tags": "database,postgresql",
91+
"version": "16"
92+
},
93+
"from": {
94+
"kind": "DockerImage",
95+
"name": "registry.redhat.io/rhel8/postgresql-16:latest"
96+
},
97+
"referencePolicy": {
98+
"type": "Local"
99+
}
100+
},
101+
{
102+
"name": "15-el8",
103+
"annotations": {
104+
"openshift.io/display-name": "PostgreSQL 15 (RHEL 8)",
105+
"openshift.io/provider-display-name": "Red Hat, Inc.",
106+
"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.",
107+
"iconClass": "icon-postgresql",
108+
"tags": "database,postgresql",
109+
"version": "15"
110+
},
111+
"from": {
112+
"kind": "DockerImage",
113+
"name": "registry.redhat.io/rhel8/postgresql-15:latest"
114+
},
115+
"referencePolicy": {
116+
"type": "Local"
117+
}
118+
},
47119
{
48120
"name": "13-el8",
49121
"annotations": {

‎imagestreams/postgresql-rhel.json‎

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,24 @@
2323
"name": "15-el8"
2424
}
2525
},
26+
{
27+
"name": "16-el9",
28+
"annotations": {
29+
"openshift.io/display-name": "PostgreSQL 16 (RHEL 9)",
30+
"openshift.io/provider-display-name": "Red Hat, Inc.",
31+
"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.",
32+
"iconClass": "icon-postgresql",
33+
"tags": "database,postgresql",
34+
"version": "16"
35+
},
36+
"from": {
37+
"kind": "DockerImage",
38+
"name": "registry.redhat.io/rhel9/postgresql-16:latest"
39+
},
40+
"referencePolicy": {
41+
"type": "Local"
42+
}
43+
},
2644
{
2745
"name": "15-el9",
2846
"annotations": {
@@ -41,6 +59,24 @@
4159
"type": "Local"
4260
}
4361
},
62+
{
63+
"name": "16-el8",
64+
"annotations": {
65+
"openshift.io/display-name": "PostgreSQL 16 (RHEL 8)",
66+
"openshift.io/provider-display-name": "Red Hat, Inc.",
67+
"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.",
68+
"iconClass": "icon-postgresql",
69+
"tags": "database,postgresql",
70+
"version": "16"
71+
},
72+
"from": {
73+
"kind": "DockerImage",
74+
"name": "registry.redhat.io/rhel8/postgresql-16:latest"
75+
},
76+
"referencePolicy": {
77+
"type": "Local"
78+
}
79+
},
4480
{
4581
"name": "15-el8",
4682
"annotations": {

‎test/test-lib-postgresql.sh‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,15 @@ function test_postgresql_integration() {
1818
namespace_image="rhscl/postgresql-${VERSION}-rhel7"
1919
else
2020
namespace_image="${OS}/postgresql-${VERSION}"
21+
# Check if the current version is already GA
22+
# This directory is cloned from TMT plan repo 'sclorg-tmt-plans'
23+
local devel_file="/root/sclorg-tmt-plans/devel_images"
24+
if [ -f "${devel_file}" ]; then
25+
if grep -q "${OS}=postgresql-container=${VERSION}" "$devel_file" ; then
26+
echo "This version is currently developed, so skipping this test."
27+
return
28+
fi
29+
fi
2130
fi
2231
TEMPLATES="postgresql-ephemeral-template.json
2332
postgresql-persistent-template.json"
@@ -42,6 +51,15 @@ function test_postgresql_imagestream() {
4251
elif [ "${OS}" == "rhel9" ]; then
4352
tag="-el9"
4453
fi
54+
# Check if the current version is already GA
55+
# This directory is cloned from TMT plan repo 'sclorg-tmt-plans'
56+
local devel_file="/root/sclorg-tmt-plans/devel_images"
57+
if [ -f "${devel_file}" ]; then
58+
if grep -q "${OS}=postgresql-container=${VERSION}" "$devel_file" ; then
59+
echo "This version is currently developed, so skipping this test."
60+
return
61+
fi
62+
fi
4563
TEMPLATES="postgresql-ephemeral-template.json
4664
postgresql-persistent-template.json"
4765
for template in $TEMPLATES; do

0 commit comments

Comments
 (0)