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

Jump to bottom

remove imagestreams which are not GA #231

Merged
merged 2 commits into from
Apr 4, 2024
Merged

remove imagestreams which are not GA #231

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc315c2
remove imagestreams which are not GA
phracek Apr 3, 2024
42c85c7
Fix typo in run_latest_imagestreams functoin
phracek Apr 3, 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
38 changes: 1 addition & 37 deletions imagestreams/mariadb-centos.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "10.11-el9"
"name": "10.5-el9"
},
"referencePolicy": {
"type": "Local"
Expand All @@ -44,42 +44,6 @@
"type": "Local"
}
},
{
"name": "10.11-el9",
"annotations": {
"openshift.io/display-name": "MariaDB 10.11 (CentOS 9 Stream)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "Provides a MariaDB 10.11 database on CentOS 9 Stream. 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": "quay.io/sclorg/mariadb-1011-c9s:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "10.11-el8",
"annotations": {
"openshift.io/display-name": "MariaDB 10.11 (CentOS 8 Stream)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "Provides a MariaDB 10.11 database on CentOS 8 Stream. 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": "quay.io/sclorg/mariadb-1011-c8s:latest"
},
"referencePolicy": {
"type": "Local"
}
},
{
"name": "10.5-el9",
"annotations": {
Expand Down
38 changes: 1 addition & 37 deletions imagestreams/mariadb-rhel-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "10.11-el8"
"name": "10.5-el8"
},
"referencePolicy": {
"type": "Local"
Expand Down Expand Up @@ -79,42 +79,6 @@
"referencePolicy": {
"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.11-el9",
"annotations": {
"openshift.io/display-name": "MariaDB 10.11 (RHEL 9)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "Provides a MariaDB 10.11 database on RHEL 9. 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/rhel9/mariadb-1011:latest"
},
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
38 changes: 1 addition & 37 deletions imagestreams/mariadb-rhel.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
},
"from": {
"kind": "ImageStreamTag",
"name": "10.11-el8"
"name": "10.5-el8"
},
"referencePolicy": {
"type": "Local"
Expand Down Expand Up @@ -133,42 +133,6 @@
"referencePolicy": {
"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.11-el9",
"annotations": {
"openshift.io/display-name": "MariaDB 10.11 (RHEL 9)",
"openshift.io/provider-display-name": "Red Hat, Inc.",
"description": "Provides a MariaDB 10.11 database on RHEL 9. 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/rhel9/mariadb-1011:latest"
},
"referencePolicy": {
"type": "Local"
}
}
]
}
Expand Down
9 changes: 9 additions & 0 deletions test/test-lib-mysql.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,15 @@ function test_mariadb_template() {

# Check the latest imagestreams
function run_latest_imagestreams() {
# 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}=mariadb-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