Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing imagestreams for Postgresql 16 #553

Merged
merged 4 commits into from
Mar 21, 2024
Merged

Add missing imagestreams for Postgresql 16 #553

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f279b98
Add missing imagestreams for Postgresql 16
phracek Mar 12, 2024
d22afba
Add workaround for postgresql-16 that is not released yet.
phracek Mar 12, 2024
f8e6b12
Skipping tests because imagestreams does not exist yet
phracek Mar 12, 2024
43eef02
Fix container name in devel_images file
phracek Mar 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions imagestreams/postgresql-centos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,24 @@
"type": "Local"
}
},
{
"name": "16-el9",
"annotations": {
"openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 9)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"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.",
"iconClass": "icon-postgresql",
"tags": "database,postgresql",
"version": "16"
},
"from": {
"kind": "DockerImage",
"name": "quay.io/sclorg/postgresql-16-c9s:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "15-el9",
"annotations": {
Expand Down Expand Up @@ -62,6 +80,24 @@
"type": "Local"
}
},
{
"name": "16-el8",
"annotations": {
"openshift.io/display-name": "PostgreSQL 16 (CentOS Stream 8)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"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.",
"iconClass": "icon-postgresql",
"tags": "database,postgresql",
"version": "16"
},
"from": {
"kind": "DockerImage",
"name": "quay.io/sclorg/postgresql-16-c8s:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "15-el8",
"annotations": {
Expand Down
72 changes: 72 additions & 0 deletions imagestreams/postgresql-rhel-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,42 @@
"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": "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": "13-el9",
"annotations": {
Expand All @@ -44,6 +80,42 @@
"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-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-el8",
"annotations": {
Expand Down
36 changes: 36 additions & 0 deletions imagestreams/postgresql-rhel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,24 @@
"name": "15-el8"
}
},
{
"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": "15-el9",
"annotations": {
Expand All @@ -41,6 +59,24 @@
"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-el8",
"annotations": {
Expand Down
18 changes: 18 additions & 0 deletions test/test-lib-postgresql.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ function test_postgresql_integration() {
namespace_image="rhscl/postgresql-${VERSION}-rhel7"
else
namespace_image="${OS}/postgresql-${VERSION}"
# Check if the current version is already GA
# This directory is cloned from TMT plan repo 'sclorg-tmt-plans'
local devel_file="/root/sclorg-tmt-plans/devel_images"
if [ -f "${devel_file}" ]; then
if grep -q "${OS}=postgresql-container=${VERSION}" "$devel_file" ; then
echo "This version is currently developed, so skipping this test."
return
fi
fi
fi
TEMPLATES="postgresql-ephemeral-template.json
postgresql-persistent-template.json"
Expand All @@ -42,6 +51,15 @@ function test_postgresql_imagestream() {
elif [ "${OS}" == "rhel9" ]; then
tag="-el9"
fi
# Check if the current version is already GA
# This directory is cloned from TMT plan repo 'sclorg-tmt-plans'
local devel_file="/root/sclorg-tmt-plans/devel_images"
if [ -f "${devel_file}" ]; then
if grep -q "${OS}=postgresql-container=${VERSION}" "$devel_file" ; then
echo "This version is currently developed, so skipping this test."
return
fi
fi
TEMPLATES="postgresql-ephemeral-template.json
postgresql-persistent-template.json"
for template in $TEMPLATES; do
Expand Down