You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by mr...@apache.org on 2017/09/11 21:17:59 UTC
[incubator-openwhisk-wskdeploy] branch master updated: Update
Dependency use case to use incubator-openwhisk-test packages (#470)
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 38d32f1 Update Dependency use case to use incubator-openwhisk-test packages (#470)
38d32f1 is described below
commit 38d32f1cfcba8fa9946415351cc6fc1cdc45d272
Author: Ying Chun Guo <gu...@cn.ibm.com>
AuthorDate: Tue Sep 12 05:17:57 2017 +0800
Update Dependency use case to use incubator-openwhisk-test packages (#470)
---
tests/usecases/dependency/README.md | 51 ++++++++++-----------------------
tests/usecases/dependency/manifest.yaml | 8 +++---
2 files changed, 19 insertions(+), 40 deletions(-)
diff --git a/tests/usecases/dependency/README.md b/tests/usecases/dependency/README.md
index f37f707..1c5cd21 100644
--- a/tests/usecases/dependency/README.md
+++ b/tests/usecases/dependency/README.md
@@ -6,9 +6,9 @@ Below is the `dependencies` segement in `manifest.yaml`.
```
dependencies:
hellowhisk:
- location: github.com/paulcastro/hellowhisk
- newpkg:
- location: github.com/daisy-ycguo/wskdeploy-test/helloworld
+ location: github.com/apache/incubator-openwhisk-test/packages/hellowhisk
+ myhelloworlds:
+ location: github.com/apache/incubator-openwhisk-test/packages/helloworlds
myCloudant:
location: /whisk.system/cloudant
inputs:
@@ -18,35 +18,18 @@ dependencies:
```
It defines three dependencies:
-- `hellowhisk` is a dependency to an external package whose source code is in a git repo `https://github.com/paulcastro/hellowhisk`. `wskdeploy` will deploy the package according to the manifest and deployment files in the root folder of `https://github.com/paulcastro/hellowhisk`.
-- `newpkg` is a dependency to an external package whose source code is in a sub folder `helloworld` in git repo `https://github.com/daisy-ycguo/wskdeploy-test`. `wskdeploy` will deploy the package according to the manifest and deployment files in the folder `helloworld` in `https://github.com/daisy-ycguo/wskdeploy-test`. When `wskdeploy` notices the dependency name `newpkg` is different from the original package name `myhelloworld`, it will create a package binding `newpkg` to `myhellowo [...]
+- `hellowhisk` is a dependency to an external package whose source code is in a folder in a git repo `https://github.com/apache/incubator-openwhisk-test`. `wskdeploy` will deploy the package according to the manifest and deployment files in the folder `packages/hellowhisk` of this repo.
+- `myhelloworlds` is a dependency to an external package whose source code is another folder in the git repo `https://github.com/apache/incubator-openwhisk-test`. `wskdeploy` will deploy the package according to the manifest and deployment files in the folder `packages/helloworlds` in this repo. When `wskdeploy` notices the dependency name `myhelloworlds` is different from the original package name `helloworlds`, it will create a package binding `myhelloworlds` to `helloworlds` so that a [...]
```
sequences:
mySequence:
- actions: hellowhisk/greeting, hellowhisk/httpGet, newpkg/helloworld
+ actions: hellowhisk/greeting, hellowhisk/httpGet, myhelloworlds/hello-js
```
- `myCloudant` is a binding to the existing system package `/whisk.system/cloudant`. `wskdeploy` will create a package binding `myCloudant` to `/whisk.system/cloudant` with the input parameters and annotations.
To install this show case, try this:
```
$ wskdeploy -m ./tests/usecases/dependency/manifest.yaml
-Deploying package opentest ... Done!
-Deploying dependency newpkg ...
-Deploying package myhelloworld ... Done!
-Deploying action myhelloworld/helloworld ... Done!
-Done!
-Deploying package binding newpkg ... Done!
-Deploying dependency myCloudant ...
-Deploying package binding myCloudant ... Done!
-Deploying dependency hellowhisk ...
-Deploying package hellowhisk ... Done!
-Deploying action hellowhisk/httpGet ... Done!
-Deploying action hellowhisk/greeting ... Done!
-Done!
-Deploying action opentest/mySequence ... Done!
-Done!
-Deploying rule myRule ... Done!
-Deploying rule myCloudantRule ... Done!
```
To verify all the assets are deployed in OpenWhisk, try this:
@@ -56,14 +39,15 @@ Entities in namespace: <your_name_space>
packages
/<your_name_space>/hellowhisk private
/<your_name_space>/myCloudant private
-/<your_name_space>/newpkg private
-/<your_name_space>/myhelloworld private
+/<your_name_space>/myhelloworlds private
+/<your_name_space>/helloworlds private
/<your_name_space>/opentest private
actions
/<your_name_space>/opentest/mySequence private sequence
/<your_name_space>/hellowhisk/greeting private nodejs:6
/<your_name_space>/hellowhisk/httpGet private swift:3
-/<your_name_space>/myhelloworld/helloworld private nodejs:6
+/<your_name_space>/helloworlds/hello-js private nodejs:6
+/<your_name_space>/helloworlds/helloworld-js private nodejs:6
triggers
/<your_name_space>/myTrigger private
rules
@@ -77,17 +61,12 @@ package /<your_name_space>/hellowhisk
action /<your_name_space>/hellowhisk/greeting
action /<your_name_space>/hellowhisk/httpGet
```
-To verify package `myhelloworld` is deployed, try this:
+To verify package `myhelloworlds` is deployed, try this:
```
-$ wsk package get --summary myhelloworld
-package /<your_name_space>/myhelloworld
- action /<your_name_space>/myhelloworld/helloworld
-```
-To verify a package binding `newpkg` is installed, try this:
-```
-$ wsk package get --summary newpkg
-package /<your_name_space>/newpkg
- action /<your_name_space>/newpkg/helloworld
+$ wsk package get --summary myhelloworlds
+package /<your_name_space>/myhelloworlds
+ action /<your_name_space>/myhelloworlds/hello-js
+ action /<your_name_space>/myhelloworlds/helloworld-js
```
To verify a package binding `mycloudant` is installed, try this:
```
diff --git a/tests/usecases/dependency/manifest.yaml b/tests/usecases/dependency/manifest.yaml
index 680f1a1..dad9bb0 100644
--- a/tests/usecases/dependency/manifest.yaml
+++ b/tests/usecases/dependency/manifest.yaml
@@ -2,9 +2,9 @@ package:
name: opentest
dependencies:
hellowhisk:
- location: github.com/paulcastro/hellowhisk
- newpkg:
- location: github.com/daisy-ycguo/wskdeploy-test/helloworld
+ location: github.com/apache/incubator-openwhisk-test/packages/hellowhisk
+ myhelloworlds:
+ location: github.com/apache/incubator-openwhisk-test/packages/helloworlds
myCloudant:
location: /whisk.system/cloudant
inputs:
@@ -13,7 +13,7 @@ package:
myAnnotation: Here it is
sequences:
mySequence:
- actions: hellowhisk/greeting, hellowhisk/httpGet, newpkg/helloworld
+ actions: hellowhisk/greeting, hellowhisk/httpGet, myhelloworlds/hello-js
triggers:
myTrigger:
rules:
--
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].