Skip to content

Commit

Permalink
Add proper latest tag (#228)
Browse files Browse the repository at this point in the history
Fix check for devel image. There should not be postgresql-container
but mariadb-container.

Allow check for the latest imagestreams

Signed-off-by: Petr "Stone" Hracek <phracek@redhat.com>
  • Loading branch information
phracek authored Mar 26, 2024
1 parent d7f5c49 commit cc69ec3
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 17 deletions.
2 changes: 1 addition & 1 deletion imagestreams/mariadb-centos.json
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
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
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
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

0 comments on commit cc69ec3

Please sign in to comment.