Allow using extra sources

This is an ugly hack to be able to reuse the scripts to test custom
repos and rpms

Change-Id: I3ea253c6959cd65b31970416619fda017ff0b5cd
Signed-off-by: David Caro <dcaroest@redhat.com>

automation/basic_suite_3.6.sh

@@ -4,9 +4,9 @@
 # mock_runner.sh or chrooter, from the root of the repository:
 #
 # $ cd repository/root
-# $ mock_runner.sh -e automation/basic_suite_3.5.sh
+# $ mock_runner.sh -e automation/basic_suite_3.6.sh
 # or
-# $ chrooter -s automation/basic_suite_3.5.sh
+# $ chrooter -s automation/basic_suite_3.6.sh
 #
 
 cleanup() {
@@ -28,6 +28,14 @@ export LIBGUESTFS_BACKEND=direct
 #export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1
 trap cleanup SIGTERM EXIT
 res=0
-./run_suite.sh basic_suite_3.6 \
+
+# This is used to test external sources
+# it's done by putting them one by line in the ./extra_sources file
+extra_sources_cmd=''
+if [[ -e ./extra_sources ]]; then
+    extra_sources_cmd+="-s \"conf:$PWD/extra_sources\""
+fi
+
+./run_suite.sh $extra_sources_cmd basic_suite_3.6 \
 || res=$?
 exit $res

automation/basic_suite_4.0.sh

@@ -4,9 +4,9 @@
 # mock_runner.sh or chrooter, from the root of the repository:
 #
 # $ cd repository/root
-# $ mock_runner.sh -e automation/basic_suite_master.sh
+# $ mock_runner.sh -e automation/basic_suite_4.0.sh
 # or
-# $ chrooter -s automation/basic_suite_master.sh
+# $ chrooter -s automation/basic_suite_4.0.sh
 #
 
 cleanup() {
@@ -28,6 +28,14 @@ export LIBGUESTFS_BACKEND=direct
 #export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1
 trap cleanup SIGTERM EXIT
 res=0
-./run_suite.sh basic_suite_4.0 \
+
+# This is used to test external sources
+# it's done by putting them one by line in the ./extra_sources file
+extra_sources_cmd=''
+if [[ -e ./extra_sources ]]; then
+    extra_sources_cmd+="-s \"conf:$PWD/extra_sources\""
+fi
+
+./run_suite.sh $extra_sources_cmd basic_suite_4.0 \
 || res=$?
 exit $res

automation/basic_suite_master.sh

@@ -28,6 +28,14 @@ export LIBGUESTFS_BACKEND=direct
 #export LIBGUESTFS_DEBUG=1 LIBGUESTFS_TRACE=1
 trap cleanup SIGTERM EXIT
 res=0
-./run_suite.sh basic_suite_master \
+
+# This is used to test external sources
+# it's done by putting them one by line in the ./extra_sources file
+extra_sources_cmd=''
+if [[ -e ./extra_sources ]]; then
+    extra_sources_cmd+="-s \"conf:$PWD/extra_sources\""
+fi
+
+./run_suite.sh $extra_sources_cmd basic_suite_master \
 || res=$?
 exit $res

basic_suite_3.6/control.sh

@@ -31,7 +31,7 @@ run_suite () {
         env_collect "$PWD/test_logs/${SUITE##*/}/post-${scenario##*/}"
         if $failed; then
             echo "@@@@ ERROR: Failed running $scenario"
-            break
+            return 1
         fi
     done
 }

image_ng_suite_3.6/control.sh

@@ -152,7 +152,7 @@ run_suite(){
         env_collect "$curdir/test_logs/${suite##*/}/post-${scenario##*/}"
         if $failed; then
             echo "@@@@ ERROR: Failed running $scenario"
-            break
+            return 1
         fi
     done
 }

run_suite.sh

@@ -62,6 +62,7 @@ env_repo_setup () {\
     cd $PREFIX
     for extrasrc in "${EXTRA_SOURCES[@]}"; do
         extrasrcs+=("--custom-source=$extrasrc")
+        echo "Adding extra source: $extrasrc"
     done
     $CLI ovirt reposetup \
         --reposync-yum-config $SUITE/reposync-config.repo \