Update from the upstream Github repository

test/check_imagestreams.py

@@ -3,6 +3,7 @@
 import sys
 import json
 import logging
+import os
 
 from pathlib import Path
 from typing import Dict
@@ -47,6 +48,9 @@ class ImageStreamChecker(object):
             print(f"No json files present in {IMAGESTREAMS_DIR}.")
             return 0
         for f in json_files:
+            if os.environ.get("TARGET") in ("rhel7", "centos7") and "aarch64" in str(f):
+                print("Imagestream aarch64 is not supported on rhel7")
+                continue
             print(f"Checking file {str(f)}.")
             json_dict = self.load_json_file(f)
             if not (self.check_version(json_dict) and self.check_latest_tag(json_dict)):

test/from-dockerfile/Dockerfile.tpl

@@ -0,0 +1,14 @@
+FROM #IMAGE_NAME# # Replaced by sed in tests, see test_from_dockerfile in test/run
+
+# Add application sources to a directory that the assemble script expects them
+# and set permissions so that the container runs without root access
+USER 0
+ADD app-src /tmp/src
+RUN chown -R 1001:0 /tmp/src
+USER 1001
+
+# Install the dependencies
+RUN /usr/libexec/s2i/assemble
+
+# Set the default command for the resulting image
+CMD /usr/libexec/s2i/run

test/run

@@ -187,15 +187,11 @@ test_application() {
   cleanup_app
 }
 
-test_latest_imagestreams() {
-  local result=1
-  info "Testing the latest version in imagestreams"
-  # Switch to root directory of a container
-  pushd "${test_dir}/../.." >/dev/null || return 1
-  ct_check_latest_imagestreams
-  result=$?
-  popd >/dev/null || return 1
-  check_result $result
+test_from_dockerfile(){
+  info "Test from Dockerfile"
+  sed "s@#IMAGE_NAME#@${IMAGE_NAME}@" $test_dir/from-dockerfile/Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
+  ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile 'https://github.com/sclorg/django-ex.git' 'Welcome to your Django application on OpenShift' app-src
+  check_result $?
 }
 
 # Since we built the candidate image locally, we don't want S2I attempt to pull
@@ -234,10 +230,24 @@ for app in ${@:-${WEB_APPS[@]}}; do
   # test application with init wrapper
   CONTAINER_ARGS="-e ENABLE_INIT_WRAPPER=true" test_application
 
-  test_latest_imagestreams
-
   info "All tests for the ${app} finished successfully."
   cleanup ${app}
 done
 
+if [ "$OS" == "rhel7" ] || [ "$OS" == "centos7" ]; then
+   # autocleanup only enabled here as only the following tests so far use it
+   CID_FILE_DIR=$(mktemp -d)
+   ct_enable_cleanup
+
+   info "Testing variable presence during \`docker exec\`"
+   ct_check_exec_env_vars
+   check_result $?
+
+   info "Checking if all scl variables are defined in Dockerfile"
+   ct_check_scl_enable_vars
+   check_result $?
+fi
+
+test_from_dockerfile
+
 info "All tests finished successfully."

test/run-openshift

@@ -7,6 +7,7 @@
 # The image has to be available before this script is executed.
 
 THISDIR=$(dirname ${BASH_SOURCE[0]})
+test_dir="$(readlink -f $(dirname ${BASH_SOURCE[0]}))"
 
 source "${THISDIR}/test-lib.sh"
 source "${THISDIR}/test-lib-openshift.sh"
@@ -16,6 +17,14 @@ set -eo nounset
 
 trap ct_os_cleanup EXIT SIGINT
 
+test_latest_imagestreams() {
+  info "Testing the latest version in imagestreams"
+  # Switch to root directory of a container
+  pushd "${test_dir}/../.." >/dev/null
+  ct_check_latest_imagestreams
+  popd >/dev/null
+}
+
 ct_os_check_compulsory_vars
 
 ct_os_enable_print_logs
@@ -44,6 +53,9 @@ done
 # Check the imagestream
 test_python_imagestream
 
+# check if latest imagestream version is correct
+test_latest_imagestreams
+
 OS_TESTSUITE_RESULT=0
 
 ct_os_cluster_down

test/test-lib-openshift.sh

@@ -769,7 +769,9 @@ function ct_os_test_template_app_func() {
     else
       echo "Uploading image ${image_name} as ${image_tagged}"
       ct_os_upload_image "${image_name}" "${image_tagged}"
-
+    fi
+  fi
+  if [ "${CT_SKIP_UPLOAD_IMAGE:-false}" == 'false' ] ; then
       # upload also other images, that template might need (list of pairs in the format <image>|<tag>
       local image_tag_a
       local i_t
@@ -777,9 +779,12 @@ function ct_os_test_template_app_func() {
         echo "${i_t}"
         IFS='|' read -ra image_tag_a <<< "${i_t}"
         docker pull "${image_tag_a[0]}"
-        ct_os_upload_image "${image_tag_a[0]}" "${image_tag_a[1]}"
+        if [ "${CT_EXTERNAL_REGISTRY:-false}" == 'true' ] ; then
+          ct_os_import_image_ocp4 "${image_tag_a[0]}" "${image_tag_a[1]}"
+        else
+          ct_os_upload_image "${image_tag_a[0]}" "${image_tag_a[1]}"
+        fi
       done
-    fi
   fi
 
   # get the template file from remote or local location; if not found, it is

test/test-lib.sh

@@ -27,6 +27,7 @@ EXPECTED_EXIT_CODE=0
 function ct_cleanup() {
   ct_show_resources
   for cid_file in "$CID_FILE_DIR"/* ; do
+    [ -f "$cid_file" ] || continue
     local container
     container=$(cat "$cid_file")
 
@@ -69,6 +70,7 @@ function ct_check_envs_set {
   loop_envs=$1; shift
   env_format=${1:-"*VALUE*"}
   while read -r variable; do
+    [ -z "$variable" ] && continue
     var_name=$(echo "$variable" | awk -F= '{ print $1 }')
     stripped=$(echo "$variable" | awk -F= '{ print $2 }')
     filtered_envs=$(echo "$check_envs" | grep "^$var_name=")
@@ -340,7 +342,7 @@ function ct_binary_found_from_df() {
   # Create Dockerfile that looks for the binary
   cat <<EOF >"$tmpdir/Dockerfile"
 FROM $IMAGE_NAME
-RUN which $binary | grep "$binary_path"
+RUN command -v $binary | grep "$binary_path"
 EOF
   # Build an image, looking for expected path in the output
   if ! docker build -f "$tmpdir/Dockerfile" --no-cache "$tmpdir"; then
@@ -558,7 +560,7 @@ ct_registry_from_os() {
         registry=registry.redhat.io
         ;;
     *)
-        registry=docker.io
+        registry=quay.io
         ;;
     esac
   echo "$registry"
@@ -584,9 +586,9 @@ ct_get_public_image_name() {
   elif [ "x$os" == "xrhel8" ]; then
     public_image_name=$registry/rhel8/$base_image_name-${version//./}
   elif [ "x$os" == "xcentos7" ]; then
-    public_image_name=$registry/centos/$base_image_name-${version//./}-centos7
+    public_image_name=$registry/centos7/$base_image_name-${version//./}-centos7
   elif [ "x$os" == "xcentos8" ]; then
-    public_image_name=$registry/centos/$base_image_name-${version//./}-centos8
+    public_image_name=$registry/centos8/$base_image_name-${version//./}-centos8
   fi
 
   echo "$public_image_name"