From 56c9a98ff4d58918b989f9db79415cae1315967d Mon Sep 17 00:00:00 2001
From: Lumir Balhar <lbalhar@redhat.com>
Date: Mon, 13 Feb 2023 08:40:31 +0100
Subject: [PATCH] Distgen generated content

---
 2.7/test/run         | 14 +++++++++-----
 3.10/test/run        | 14 +++++++++-----
 3.11/test/run        | 14 +++++++++-----
 3.6/test/run         | 14 +++++++++-----
 3.8/test/run         | 14 +++++++++-----
 3.9-minimal/test/run | 14 +++++++++-----
 3.9/test/run         | 14 +++++++++-----
 7 files changed, 63 insertions(+), 35 deletions(-)

diff --git a/2.7/test/run b/2.7/test/run
index 90831739..fa583ba7 100755
--- a/2.7/test/run
+++ b/2.7/test/run
@@ -270,11 +270,15 @@ test_from_dockerfile_minimal(){
   # ubi8/python-39-minimal / ubi8/python-39
   FULL_IMAGE_NAME=${IMAGE_NAME/-minimal/}
 
-  # mod_wsgi in micropipenv-requirements-test-app
-  # TODO: Find a better way how to specify full/minimal images that should work together
-  sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
-  ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
-  check_result $?
+  if ct_pull_image "$FULL_IMAGE_NAME"; then
+    # mod_wsgi in micropipenv-requirements-test-app
+    sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
+    ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
+    check_result $?
+  else
+    echo "[SKIP] Multistage build from Dockerfile - $FULL_IMAGE_NAME does not exists."
+  fi
+
 }
 
 test_application_with_user() {
diff --git a/3.10/test/run b/3.10/test/run
index d10aea61..9e9cecdf 100755
--- a/3.10/test/run
+++ b/3.10/test/run
@@ -270,11 +270,15 @@ test_from_dockerfile_minimal(){
   # ubi8/python-39-minimal / ubi8/python-39
   FULL_IMAGE_NAME=${IMAGE_NAME/-minimal/}
 
-  # mod_wsgi in micropipenv-requirements-test-app
-  # TODO: Find a better way how to specify full/minimal images that should work together
-  sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
-  ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
-  check_result $?
+  if ct_pull_image "$FULL_IMAGE_NAME"; then
+    # mod_wsgi in micropipenv-requirements-test-app
+    sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
+    ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
+    check_result $?
+  else
+    echo "[SKIP] Multistage build from Dockerfile - $FULL_IMAGE_NAME does not exists."
+  fi
+
 }
 
 test_application_with_user() {
diff --git a/3.11/test/run b/3.11/test/run
index d10aea61..9e9cecdf 100755
--- a/3.11/test/run
+++ b/3.11/test/run
@@ -270,11 +270,15 @@ test_from_dockerfile_minimal(){
   # ubi8/python-39-minimal / ubi8/python-39
   FULL_IMAGE_NAME=${IMAGE_NAME/-minimal/}
 
-  # mod_wsgi in micropipenv-requirements-test-app
-  # TODO: Find a better way how to specify full/minimal images that should work together
-  sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
-  ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
-  check_result $?
+  if ct_pull_image "$FULL_IMAGE_NAME"; then
+    # mod_wsgi in micropipenv-requirements-test-app
+    sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
+    ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
+    check_result $?
+  else
+    echo "[SKIP] Multistage build from Dockerfile - $FULL_IMAGE_NAME does not exists."
+  fi
+
 }
 
 test_application_with_user() {
diff --git a/3.6/test/run b/3.6/test/run
index d10aea61..9e9cecdf 100755
--- a/3.6/test/run
+++ b/3.6/test/run
@@ -270,11 +270,15 @@ test_from_dockerfile_minimal(){
   # ubi8/python-39-minimal / ubi8/python-39
   FULL_IMAGE_NAME=${IMAGE_NAME/-minimal/}
 
-  # mod_wsgi in micropipenv-requirements-test-app
-  # TODO: Find a better way how to specify full/minimal images that should work together
-  sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
-  ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
-  check_result $?
+  if ct_pull_image "$FULL_IMAGE_NAME"; then
+    # mod_wsgi in micropipenv-requirements-test-app
+    sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
+    ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
+    check_result $?
+  else
+    echo "[SKIP] Multistage build from Dockerfile - $FULL_IMAGE_NAME does not exists."
+  fi
+
 }
 
 test_application_with_user() {
diff --git a/3.8/test/run b/3.8/test/run
index d10aea61..9e9cecdf 100755
--- a/3.8/test/run
+++ b/3.8/test/run
@@ -270,11 +270,15 @@ test_from_dockerfile_minimal(){
   # ubi8/python-39-minimal / ubi8/python-39
   FULL_IMAGE_NAME=${IMAGE_NAME/-minimal/}
 
-  # mod_wsgi in micropipenv-requirements-test-app
-  # TODO: Find a better way how to specify full/minimal images that should work together
-  sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
-  ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
-  check_result $?
+  if ct_pull_image "$FULL_IMAGE_NAME"; then
+    # mod_wsgi in micropipenv-requirements-test-app
+    sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
+    ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
+    check_result $?
+  else
+    echo "[SKIP] Multistage build from Dockerfile - $FULL_IMAGE_NAME does not exists."
+  fi
+
 }
 
 test_application_with_user() {
diff --git a/3.9-minimal/test/run b/3.9-minimal/test/run
index d858f0c3..acd5328d 100755
--- a/3.9-minimal/test/run
+++ b/3.9-minimal/test/run
@@ -266,11 +266,15 @@ test_from_dockerfile_minimal(){
   # ubi8/python-39-minimal / ubi8/python-39
   FULL_IMAGE_NAME=${IMAGE_NAME/-minimal/}
 
-  # mod_wsgi in micropipenv-requirements-test-app
-  # TODO: Find a better way how to specify full/minimal images that should work together
-  sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
-  ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
-  check_result $?
+  if ct_pull_image "$FULL_IMAGE_NAME"; then
+    # mod_wsgi in micropipenv-requirements-test-app
+    sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
+    ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
+    check_result $?
+  else
+    echo "[SKIP] Multistage build from Dockerfile - $FULL_IMAGE_NAME does not exists."
+  fi
+
 }
 
 test_application_with_user() {
diff --git a/3.9/test/run b/3.9/test/run
index d10aea61..9e9cecdf 100755
--- a/3.9/test/run
+++ b/3.9/test/run
@@ -270,11 +270,15 @@ test_from_dockerfile_minimal(){
   # ubi8/python-39-minimal / ubi8/python-39
   FULL_IMAGE_NAME=${IMAGE_NAME/-minimal/}
 
-  # mod_wsgi in micropipenv-requirements-test-app
-  # TODO: Find a better way how to specify full/minimal images that should work together
-  sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
-  ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
-  check_result $?
+  if ct_pull_image "$FULL_IMAGE_NAME"; then
+    # mod_wsgi in micropipenv-requirements-test-app
+    sed "s@#IMAGE_NAME#@${IMAGE_NAME}@;s@#FULL_IMAGE_NAME#@${FULL_IMAGE_NAME}@" $test_dir/from-dockerfile/mod_wsgi.Dockerfile.tpl > $test_dir/from-dockerfile/Dockerfile
+    ct_test_app_dockerfile $test_dir/from-dockerfile/Dockerfile $test_dir/micropipenv-requirements-test-app 'Hello World from mod_wsgi hosted WSGI application!' app-src
+    check_result $?
+  else
+    echo "[SKIP] Multistage build from Dockerfile - $FULL_IMAGE_NAME does not exists."
+  fi
+
 }
 
 test_application_with_user() {