From 761e046b48ee242b6afabe3ce5cfba96d9e836c5 Mon Sep 17 00:00:00 2001
From: Peter Amstutz <pamstutz@veritasgenetics.com>
Date: Mon, 15 Jul 2019 14:42:34 -0400
Subject: [PATCH] Don't set ARVADOS_CONFIG if it isn't there.

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>
---
 build/run-tests.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 4027f9748a..14f889ad6e 100755
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -255,12 +255,6 @@ sanity_checks() {
     echo -n 'libpq libpq-fe.h: '
     find /usr/include -path '*/postgresql/libpq-fe.h' | egrep --max-count=1 . \
         || fatal "No libpq libpq-fe.h. Try: apt-get install libpq-dev"
-    #echo -n 'services/api/config/database.yml: '
-    #if [[ ! -f "$WORKSPACE/services/api/config/database.yml" ]]; then
-	#    fatal "Please provide a database.yml file for the test suite"
-    #else
-	#    echo "OK"
-    #fi
     echo -n 'postgresql: '
     psql --version || fatal "No postgresql. Try: apt-get install postgresql postgresql-client-common"
     echo -n 'phantomjs: '
@@ -632,6 +626,7 @@ initialize() {
 
     if [[ -s "$CONFIGSRC/config.yml" ]] ; then
 	cp "$CONFIGSRC/config.yml" "$temp/test-config.yml"
+	export ARVADOS_CONFIG="$temp/test-config.yml"
     else
 	if [[ -s /etc/arvados/config.yml ]] ; then
 	    python > "$temp/test-config.yml" <<EOF
@@ -641,10 +636,13 @@ v = list(yaml.safe_load(open('/etc/arvados/config.yml'))['Clusters'].values())[0
 v['Connection']['dbname'] = 'arvados_test'
 print(json.dumps({"Clusters": { "zzzzz": {'PostgreSQL': v}}}))
 EOF
-	    test_database=$(cat $temp/db.yml)
+	    export ARVADOS_CONFIG="$temp/test-config.yml"
+	else
+	    if [[ ! -f "$WORKSPACE/services/api/config/database.yml" ]]; then
+		fatal "Please provide a database.yml file for the test suite"
+	    fi
 	fi
     fi
-    export ARVADOS_CONFIG="$temp/test-config.yml"
 
     echo "PATH is $PATH"
 }
-- 
2.39.5