[incubator-openwhisk-wskdeploy] branch master updated: Fixing Integration test - GitHub Dependency (#402)

[mr...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new 79bed71  Fixing Integration test - GitHub Dependency (#402)
79bed71 is described below

commit 79bed718d65dc06cfe299dbf33931094585998ed
Author: Priti Desai <pd...@us.ibm.com>
AuthorDate: Mon Aug 28 19:26:12 2017 -0700

    Fixing Integration test - GitHub Dependency (#402)
    
    * Fixing dependency integration test
    
    * uncommenting integratin flag
---
 tests/src/integration/dependency/README.md         | 35 ++++++++++++++++++++++
 .../src/integration/dependency/dependency_test.go  |  2 +-
 tests/src/integration/dependency/manifest.yaml     | 32 +++++++-------------
 3 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/tests/src/integration/dependency/README.md b/tests/src/integration/dependency/README.md
new file mode 100644
index 0000000..c87dcda
--- /dev/null
+++ b/tests/src/integration/dependency/README.md
@@ -0,0 +1,35 @@
+# Integration Test - Dependencies
+
+`wskdeploy` supports dependencies where it allows you to declare other OpenWhisk
+packages that your application or project (manifest) is dependent on. With declaring
+dependent packages, `wskdeploy` supports automatic deployment of those dependent
+packages.
+
+For example, our `root-app` application is dependent on `child-app` package located
+at https://github.com/pritidesai/child-app.
+We can declare this dependency in `manifest.yaml` with:
+
+```yaml
+package:
+  name: root-app
+  namespace: guest
+  dependencies:
+    child-app:
+      location: github.com/pritidesai/child-app
+  triggers:
+    trigger1:
+  rules:
+    rule1:
+      trigger: trigger1
+      action: child-app/hello
+```
+
+**Note:**
+
+1. Package name of the dependent package `child-app` should match GitHub repo
+name `github.com/pritidesai/child-app`.
+2. `wskdeploy` creates a directory named `Packages` and clones GitHub repo of
+dependent package under `Packages`. Now the repo is cloned and renamed to
+`<package>-<branch>`. Here in our example, `wskdeploy` clones repo under
+`Packages` and renames it to `child-app-master`.
+3. Dependent packages must have `manifest.yml`.
diff --git a/tests/src/integration/dependency/dependency_test.go b/tests/src/integration/dependency/dependency_test.go
index 627d253..e5ca7cc 100644
--- a/tests/src/integration/dependency/dependency_test.go
+++ b/tests/src/integration/dependency/dependency_test.go
@@ -1,4 +1,4 @@
-// +build not_integration
+// +build integration
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more
diff --git a/tests/src/integration/dependency/manifest.yaml b/tests/src/integration/dependency/manifest.yaml
index 429b46a..6d8b48b 100644
--- a/tests/src/integration/dependency/manifest.yaml
+++ b/tests/src/integration/dependency/manifest.yaml
@@ -1,26 +1,16 @@
 package:
-  name: opentest
+  name: TestGitHubDependency
   namespace: guest
-  credential: 23bc46b1-71f6-4ed5-8c54-816aa4f8c502:123zO3xZCLrMN6v2BKK1dXYFpXlPkccOFqm12CdAsMgRU4VrNZ9lyGVCGuMDGIwP
-  apiHost: 172.17.0.1
   dependencies:
-    hellowhisk:
-      location: github.com/paulcastro/hellowhisk
-    myCloudant:
-      location: /whisk.system/cloudant
-      inputs:
-        dbname: myGreatDB
-      annotations:
-        myAnnotation: Here it is
-  sequences:
-    mySequence:
-      actions: hellowhisk/greeting, hellowhisk/httpGet
+    openwhisk-app:
+      location: github.com/pritidesai/openwhisk-app
   triggers:
-    myTrigger:
+    trigger1:
+    trigger2:
   rules:
-    myRule:
-      trigger: myTrigger
-      action: hellowhisk/httpGet
-    myCloudantRule:
-      trigger: myTrigger
-      action: myCloudant/create-database
+    rule1:
+      trigger: trigger1
+      action: openwhisk-app/hello
+    rule2:
+      trigger: trigger2
+      action: openwhisk-app/helloworld

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].