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

Add proper latest tag, allow check for latest imagestreams #228

Merged
merged 1 commit into from
Mar 26, 2024
Merged

Add proper latest tag, allow check for latest imagestreams #228

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion 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.5-el9"
"name": "10.11-el9"
},
"referencePolicy": {
"type": "Local"
Expand Down
2 changes: 1 addition & 1 deletion 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.5-el8"
"name": "10.11-el8"
},
"referencePolicy": {
"type": "Local"
Expand Down
2 changes: 1 addition & 1 deletion 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.5-el8"
"name": "10.11-el8"
},
"referencePolicy": {
"type": "Local"
Expand Down
17 changes: 3 additions & 14 deletions test/test-lib-mysql.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@ function test_mariadb_integration() {
# 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
if grep -q "${OS}=mariadb-container=${VERSION}" "$devel_file" ; then
echo "This version is currently developed, so skipping this test."
return
fi
Expand Down Expand Up @@ -157,7 +157,7 @@ function test_mariadb_imagestream() {
# 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
if grep -q "${OS}=mariadb-container=${VERSION}" "$devel_file" ; then
echo "This version is currently developed, so skipping this test."
return
fi
Expand All @@ -176,7 +176,7 @@ function test_mariadb_template() {
# 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
if grep -q "${OS}=mariadb-container=${VERSION}" "$devel_file" ; then
echo "This version is currently developed, so skipping this test."
return
fi
Expand All @@ -193,17 +193,6 @@ function test_mariadb_template() {
# Check the latest imagestreams
function run_latest_imagestreams() {
local result=1
if [ "${OS}" != "rhel7" ]; then
# 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
# Switch to root directory of a container
echo "Testing the latest version in imagestreams"
pushd "${THISDIR}/../.." >/dev/null || return 1
Expand Down