[incubator-openwhisk-cli] branch master updated: Only use OPENWHISK_HOME for tests (#257)

[du...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

dubeejw pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-cli.git


The following commit(s) were added to refs/heads/master by this push:
     new ba08720  Only use OPENWHISK_HOME for tests (#257)
ba08720 is described below

commit ba087201fd83ab5fcfa6c32c78032120785c260e
Author: Vincent <sh...@us.ibm.com>
AuthorDate: Fri Mar 23 17:28:47 2018 -0400

    Only use OPENWHISK_HOME for tests (#257)
---
 settings.gradle    | 10 ----------
 tests/build.gradle |  3 ++-
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/settings.gradle b/settings.gradle
index fc465f7..38de308 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,11 +1,3 @@
-def owPath = System.getenv("OPENWHISK_HOME") ?: '../incubator-openwhisk'
-def owDirectory = new File(owPath)
-
-if (!owDirectory.exists()) {
-    throw new GradleScriptException(
-        "Environment variable OPENWHISK_HOME must point to a valid OpenWhisk build", null)
-}
-
 include 'tests'
 
 rootProject.name = 'openwhisk-cli'
@@ -18,5 +10,3 @@ gradle.ext.scala = [
     version: '2.11.8',
     compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
 ]
-
-gradle.ext.owPath = owPath
diff --git a/tests/build.gradle b/tests/build.gradle
index a46a165..1dc5ef7 100644
--- a/tests/build.gradle
+++ b/tests/build.gradle
@@ -42,7 +42,8 @@ task deleteKeystore(type: Delete) {
 task createKeystore(dependsOn: deleteKeystore) {
     doLast {
         Properties props = new Properties()
-        props.load(new FileInputStream(file(gradle.owPath + '/whisk.properties')))
+        def owPath = System.getenv("OPENWHISK_HOME") ?: '../incubator-openwhisk'
+        props.load(new FileInputStream(file(owPath + '/whisk.properties')))
         keystorePath.parentFile.mkdirs()
         def cmd = ['keytool', '-import', '-alias', 'Whisk', '-noprompt', '-trustcacerts', '-file', file(props['whisk.ssl.cert']), '-keystore', keystorePath, '-storepass', 'openwhisk']
         cmd.execute().waitForProcessOutput(System.out, System.err)

-- 
To stop receiving notification emails like this one, please contact
dubeejw@apache.org.