Fix errors in scripts

telefonicaid · May 30, 2016 · e99bf1f · e99bf1f
1 parent e906b94
commit e99bf1f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/fiware-region-sanity-tests/resources/scripts/jenkins.sh b/fiware-region-sanity-tests/resources/scripts/jenkins.sh
@@ -193,7 +193,7 @@ function change_status() {
 	local report=$1
 
 	# Finish if no region is set or no report is given
-	[ -n "$region" && -r "$report" ] || return 0
+	[ -n "$region" -a -r "$report" ] || return 0
 
 	# Adjust status according to results report
 	local resource="sanity_tests?id=$region&type=region"

diff --git a/fiware-region-sanity-tests/sanity_checks b/fiware-region-sanity-tests/sanity_checks
@@ -88,14 +88,14 @@ END`
 
 # Default options for nosetests
 NOSEOPTS="--config=etc/nose.cfg"
+OUTPUT_NOVA_CONSOLE_NAME=test_novaconsole
 
-# Command line options (default values)
+# Command line options (default values / environment variables)
 OUTPUT_NAME=test_results
 TEMPLATE_NAME=test_report_template.html
-OUTPUT_NOVA_CONSOLE_NAME=test_novaconsole
-SANITY_CHECKS_SETTINGS=etc/settings.json
+SANITY_CHECKS_SETTINGS=${SANITY_CHECKS_SETTINGS:-etc/settings.json}
 
-# Environment variables required by the tests
+# Export environment variables required by the tests
 export SANITY_CHECKS_SETTINGS
 export TEST_PHONEHOME_ENDPOINT
 export OS_AUTH_URL OS_USERNAME OS_PASSWORD OS_USER_ID