Update from the upstream repository

This commit is contained in:
Lumir Balhar 2022-01-20 10:32:56 +01:00
commit a90dbdb3b9
7 changed files with 10 additions and 8 deletions

Binary file not shown.

View file

@ -1,6 +1,6 @@
{
"kind": "ImageStream",
"apiVersion": "v1",
"apiVersion": "image.openshift.io/v1",
"metadata": {
"name": "python",
"annotations": {

View file

@ -1,6 +1,6 @@
{
"kind": "ImageStream",
"apiVersion": "v1",
"apiVersion": "image.openshift.io/v1",
"metadata": {
"name": "python",
"annotations": {

View file

@ -1,6 +1,6 @@
{
"kind": "ImageStream",
"apiVersion": "v1",
"apiVersion": "image.openshift.io/v1",
"metadata": {
"name": "python",
"annotations": {

View file

@ -14,6 +14,7 @@ OS_TESTSUITE_RESULT=1
OS_CLUSTER_STARTED_BY_TEST=0
function ct_os_cleanup() {
echo "${test_short_summary:-}"
if [ $OS_TESTSUITE_RESULT -eq 0 ] ; then
# shellcheck disable=SC2153
echo "OpenShift tests for ${IMAGE_NAME} succeeded."
@ -957,8 +958,9 @@ ct_os_test_image_update() {
local old_image=$1; shift
local istag=$1; shift
local check_function=$1; shift
local service_name=${image_name##*/}
local ip="" check_command_exp=""
local image_name_no_namespace=${image_name##*/}
local service_name="${image_name_no_namespace%%:*}-testing"
echo "Running image update test for: $image_name"
# shellcheck disable=SC2119

View file

@ -61,9 +61,9 @@ function ct_enable_cleanup() {
# Function returns either 0 in case of pull was successful
# Or the test suite exit with 1 in case of pull error
function ct_pull_image() {
local image_name="$1"; shift
local exit=${1:-"false"}; shift
local loops=${1:-10}; shift
local image_name="$1"; [[ $# -gt 0 ]] && shift
local exit_variable=${1:-"false"}; [[ $# -gt 0 ]] && shift
local loops=${1:-10}
local loop=0
# Let's try to pull image.
@ -84,7 +84,7 @@ function ct_pull_image() {
echo "Pulling of image $image_name failed $loops times in a row. Giving up."
echo "!!! ERROR with pulling image $image_name !!!!"
# shellcheck disable=SC2268
if [[ x"$exit" == x"false" ]]; then
if [[ x"$exit_variable" == x"false" ]]; then
return 1
else
exit 1