Merge pull request #394 from sclorg/test_latest_is_distgen

Test the latest version in imagestreams

2.7/test/check_imagestreams.py

@@ -0,0 +1 @@
+../../common/check_imagestreams.py

2.7/test/run

@@ -187,6 +187,16 @@ 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
+}
 
 # Since we built the candidate image locally, we don't want S2I attempt to pull
 # it from Docker hub
@@ -224,6 +234,8 @@ 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

3.6/test/check_imagestreams.py

@@ -0,0 +1 @@
+../../common/check_imagestreams.py

3.6/test/run

@@ -187,6 +187,16 @@ 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
+}
 
 # Since we built the candidate image locally, we don't want S2I attempt to pull
 # it from Docker hub
@@ -224,6 +234,8 @@ 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

3.7/test/check_imagestreams.py

@@ -0,0 +1 @@
+../../common/check_imagestreams.py

3.7/test/run

@@ -187,6 +187,16 @@ 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
+}
 
 # Since we built the candidate image locally, we don't want S2I attempt to pull
 # it from Docker hub
@@ -224,6 +234,8 @@ 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

3.8/test/check_imagestreams.py

@@ -0,0 +1 @@
+../../common/check_imagestreams.py

3.8/test/run

@@ -187,6 +187,16 @@ 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
+}
 
 # Since we built the candidate image locally, we don't want S2I attempt to pull
 # it from Docker hub
@@ -224,6 +234,8 @@ 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

examples/npm-virtualenv-uwsgi-test-app/app.sh

@@ -13,7 +13,7 @@ packages=("pip" "setuptools" "wheel")
 for pkg in ${packages[@]}; do
   # grep returns exit code 1 if the output contains only one line starting
   # with "Requirement already …" which means that the package is updated
-  python -m pip install -U --no-python-version-warning $pkg 2>&1 | grep -v "^Requirement already up-to-date: "
+  python -m pip install -U --no-deps --no-python-version-warning $pkg 2>&1 | grep -v "^Requirement already up-to-date: "
   if [ $? -eq 0 ]; then
     echo "ERROR: Failed to upgrade '$pkg' to the latest version."
     exit 1

manifest.sh

@@ -105,6 +105,9 @@ SYMLINK_RULES="
 
     link_target=../../imagestreams
     link_name=test/imagestreams;
+
+    link_target=../../common/check_imagestreams.py
+    link_name=test/check_imagestreams.py;
 "
 
 # Files to copy

test/check_imagestreams.py

@@ -0,0 +1 @@
+../common/check_imagestreams.py

test/run

@@ -188,6 +188,16 @@ 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
+}
 
 # Since we built the candidate image locally, we don't want S2I attempt to pull
 # it from Docker hub
@@ -225,6 +235,8 @@ 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