Skip to content

remove imagestreams which are not GA #560

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.

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

Merged
merged 1 commit into from
Apr 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions imagestreams/imagestreams.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@
latest: "15-el9"
distros:
- name: CentOS Stream 8
app_versions: [10, 12, 13, 15, 16]
app_versions: [10, 12, 13, 15]

- name: CentOS Stream 9
app_versions: [13, 15, 16]
app_versions: [13, 15]

- filename: postgresql-rhel.json
latest: "15-el8"
Expand All @@ -25,16 +25,16 @@
app_versions: [10, 12, 13]

- name: RHEL 8
app_versions: [10, 12, 13, 15, 16]
app_versions: [10, 12, 13, 15]

- name: RHEL 9
app_versions: [13, 15, 16]
app_versions: [13, 15]

- filename: postgresql-rhel-aarch64.json
latest: "13-el8"
distros:
- name: RHEL 8
app_versions: [10, 12, 13, 15, 16]
app_versions: [10, 12, 13, 15]

- name: RHEL 9
app_versions: [13, 15, 16]
app_versions: [13, 15]
36 changes: 0 additions & 36 deletions imagestreams/postgresql-centos.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,24 +81,6 @@
"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": "13-el9",
"annotations": {
Expand Down Expand Up @@ -135,24 +117,6 @@
"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": "latest",
"annotations": {
Expand Down
36 changes: 0 additions & 36 deletions imagestreams/postgresql-rhel-aarch64.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,24 +81,6 @@
"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": "13-el9",
"annotations": {
Expand Down Expand Up @@ -135,24 +117,6 @@
"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": "latest",
"annotations": {
Expand Down
36 changes: 0 additions & 36 deletions imagestreams/postgresql-rhel.json
Original file line number Diff line number Diff line change
Expand Up @@ -135,24 +135,6 @@
"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": "13-el9",
"annotations": {
Expand Down Expand Up @@ -189,24 +171,6 @@
"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": "latest",
"annotations": {
Expand Down
9 changes: 9 additions & 0 deletions test/test-lib-postgresql.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,15 @@ function test_postgresql_imagestream() {


function run_latest_imagestreams_test() {
# 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
local result=1
# Switch to root directory of a container
echo "Testing the latest version in imagestreams"
Expand Down