[PATCH 2/3] Automatically collect environment variables to be passed to ks tests.

Chris Lumens clumens at redhat.com
Thu May 7 17:41:25 UTC 2015


This also changes them to start with KSTEST_ instead of TEST_, as that's
the prefix we look for to know to pass them in.
---
 tests/kickstart_tests/basic-ostree.sh        |  6 +++---
 tests/kickstart_tests/nfs-repo-and-addon.sh  | 24 ++++++++++++------------
 tests/kickstart_tests/run_kickstart_tests.sh |  8 +++++---
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/tests/kickstart_tests/basic-ostree.sh b/tests/kickstart_tests/basic-ostree.sh
index 0416f4f..22c5cc1 100755
--- a/tests/kickstart_tests/basic-ostree.sh
+++ b/tests/kickstart_tests/basic-ostree.sh
@@ -26,12 +26,12 @@ prepare() {
     ks=$1
     tmpdir=$2
 
-    if [[ "${TEST_OSTREE_REPO}" == "" ]]; then
-        echo \$TEST_OSTREE_REPO is not set.
+    if [[ "${KSTEST_OSTREE_REPO}" == "" ]]; then
+        echo \$KSTEST_OSTREE_REPO is not set.
         return 1
     fi
 
-    sed -e "/ostreesetup/ s|REPO|${TEST_OSTREE_REPO}|" ${ks} > ${tmpdir}/kickstart.ks
+    sed -e "/ostreesetup/ s|REPO|${KSTEST_OSTREE_REPO}|" ${ks} > ${tmpdir}/kickstart.ks
     echo ${tmpdir}/kickstart.ks
 }
 
diff --git a/tests/kickstart_tests/nfs-repo-and-addon.sh b/tests/kickstart_tests/nfs-repo-and-addon.sh
index be4e421..a6e35a8 100755
--- a/tests/kickstart_tests/nfs-repo-and-addon.sh
+++ b/tests/kickstart_tests/nfs-repo-and-addon.sh
@@ -25,30 +25,30 @@ prepare() {
     ks=$1
     tmpdir=$2
 
-    if [[ "${TEST_ADDON_NFS_REPO}" == "" ]]; then
-        echo \$TEST_ADDON_NFS_REPO is not set.
+    if [[ "${KSTEST_ADDON_NFS_REPO}" == "" ]]; then
+        echo \$KSTEST_ADDON_NFS_REPO is not set.
         return 1
     fi
 
-    if [[ "${TEST_ADDON_HTTP_REPO}" == "" ]]; then
-        echo \$TEST_ADDON_HTTP_REPO is not set.
+    if [[ "${KSTEST_ADDON_HTTP_REPO}" == "" ]]; then
+        echo \$KSTEST_ADDON_HTTP_REPO is not set.
         return 1
     fi
 
-    if [[ "${TEST_NFS_SERVER}" == "" ]]; then
-        echo \$TEST_NFS_SERVER is not set
+    if [[ "${KSTEST_NFS_SERVER}" == "" ]]; then
+        echo \$KSTEST_NFS_SERVER is not set
         return 1
     fi
 
-    if [[ "${TEST_NFS_PATH}" == "" ]]; then
-        echo \$TEST_NFS_PATH is not set
+    if [[ "${KSTEST_NFS_PATH}" == "" ]]; then
+        echo \$KSTEST_NFS_PATH is not set
         return 1
     fi
 
-    sed -e "/^nfs/ s|NFS-SERVER|${TEST_NFS_SERVER}|" \
-        -e "/^nfs/ s|NFS-PATH|${TEST_NFS_PATH}|" \
-        -e "/^repo/ s|NFS-ADDON-REPO|${TEST_ADDON_NFS_REPO}|" \
-        -e "/^repo/ s|HTTP-ADDON-REPO|${TEST_ADDON_HTTP_REPO}|" ${ks} > ${tmpdir}/kickstart.ks
+    sed -e "/^nfs/ s|NFS-SERVER|${KSTEST_NFS_SERVER}|" \
+        -e "/^nfs/ s|NFS-PATH|${KSTEST_NFS_PATH}|" \
+        -e "/^repo/ s|NFS-ADDON-REPO|${KSTEST_ADDON_NFS_REPO}|" \
+        -e "/^repo/ s|HTTP-ADDON-REPO|${KSTEST_ADDON_HTTP_REPO}|" ${ks} > ${tmpdir}/kickstart.ks
     echo ${tmpdir}/kickstart.ks
 }
 
diff --git a/tests/kickstart_tests/run_kickstart_tests.sh b/tests/kickstart_tests/run_kickstart_tests.sh
index 0e2990c..61350f7 100755
--- a/tests/kickstart_tests/run_kickstart_tests.sh
+++ b/tests/kickstart_tests/run_kickstart_tests.sh
@@ -68,13 +68,15 @@ fi
 KEEPIT=${KEEPIT:-0}
 
 # This is for environment variables that parallel needs to pass to
-# remote systems.  Put anything here that test cases care about or
-# they won't work when run on some systems.
+# remote systems.
 #
 # NOTE:  You will also need to add these to the list in /etc/sudoers
 # if you are using env_reset there, or they will not get passed from
 # this script to parallel.
-env_args="--env TEST_OSTREE_REPO --env TEST_NFS_SERVER --env TEST_NFS_PATH --env TEST_ADDON_NFS_REPO --env TEST_ADDON_HTTP_REPO"
+env_args=$(printenv | while read line; do
+    v="$(echo $line | cut -d'=' -f1)"
+    [[ "${v}" =~ ^KSTEST_ ]] && echo "--env ${v}"
+ done)
 
 # Round up all the kickstart tests we want to run, skipping those that are not
 # executable as well as this file itself.
-- 
2.2.2



More information about the anaconda-patches mailing list