You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by cs...@apache.org on 2017/10/31 04:52:20 UTC
[incubator-openwhisk-package-deploy] 02/02: initial commit deploy
package for OpenWhisk
This is an automated email from the ASF dual-hosted git repository.
csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk-package-deploy.git
commit 055c818daa3e084ec08dcc1356a3d3265fabf927
Author: Belinda Vennam <be...@us.ibm.com>
AuthorDate: Thu Oct 12 22:20:52 2017 -0500
initial commit deploy package for OpenWhisk
---
.gitignore | 5 +
.travis.yml | 27 +++
CONTRIBUTING.md | 66 +++++++
LICENSE.txt | 202 +++++++++++++++++++++
README.md | 62 ++++++-
gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 54708 bytes
gradle/wrapper/gradle-wrapper.properties | 5 +
gradlew | 170 +++++++++++++++++
gradlew.bat | 84 +++++++++
packages/actions/deploy.js | 170 +++++++++++++++++
packages/actions/package.json | 16 ++
packages/installCatalog.sh | 52 ++++++
packages/uninstall.sh | 20 ++
settings.gradle | 16 ++
tests/build.gradle | 28 +++
tests/credentials.json.enc | Bin 0 -> 544 bytes
tests/src/test/scala/packages/DeployTests.scala | 155 ++++++++++++++++
.../testFixtures/helloWorld/actions/helloworld.js | 17 ++
.../scala/testFixtures/helloWorld/manifest.yaml | 14 ++
.../helloWorldNoManifest/actions/helloworld.js | 17 ++
.../helloWorldPackageParam/actions/helloworld.js | 17 ++
.../helloWorldPackageParam/manifest.yaml | 14 ++
tools/travis/build.sh | 54 ++++++
23 files changed, 1209 insertions(+), 2 deletions(-)
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0ffe4de
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,5 @@
+#Gradle
+.gradle
+build/
+tests/credentials.json
+openwhisk
diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..2689029
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,27 @@
+# A Travis CI configuration file.
+
+sudo: required
+
+language: scala
+scala:
+ - 2.11.6
+
+services:
+ - docker
+
+env:
+ global:
+ - TERM=dumb
+
+notifications:
+ email: false
+
+install: true
+
+before_install:
+ - git clone https://github.com/openwhisk/openwhisk.git
+ - cd openwhisk
+ - ./tools/travis/setup.sh
+
+script:
+- ../tools/travis/build.sh
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..4dca934
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,66 @@
+<!--
+#
+# Licensed to the Apache Software Foundation (ASF) under one or more contributor
+# license agreements. See the NOTICE file distributed with this work for additional
+# information regarding copyright ownership. The ASF licenses this file to you
+# under the Apache License, Version 2.0 (the # "License"); you may not use this
+# file except in compliance with the License. You may obtain a copy of the License
+# at:
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software distributed
+# under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+# CONDITIONS OF ANY KIND, either express or implied. See the License for the
+# specific language governing permissions and limitations under the License.
+#
+-->
+
+# Contributing to Apache OpenWhisk
+
+Anyone can contribute to the OpenWhisk project and we welcome your contributions.
+
+There are multiple ways to contribute: report bugs, improve the docs, and
+contribute code, but you must follow these prerequisites and guidelines:
+
+ - [Contributor License Agreement](#contributor-license-agreement)
+ - [Raising issues](#raising-issues)
+ - [Coding Standards](#coding-standards)
+
+### Contributor License Agreement
+
+All contributors must sign and submit an Apache CLA (Contributor License Agreement).
+
+Instructions on how to do this can be found here:
+[http://www.apache.org/licenses/#clas](http://www.apache.org/licenses/#clas)
+
+Once submitted, you will receive a confirmation email from the Apache Software Foundation (ASF) and be added to
+the following list: http://people.apache.org/unlistedclas.html.
+
+Project committers will use this list to verify pull requests (PRs) come from contributors that have signed a CLA.
+
+We look forward to your contributions!
+
+## Raising issues
+
+Please raise any bug reports on the respective project repository's GitHub issue tracker. Be sure to search the
+list to see if your issue has already been raised.
+
+A good bug report is one that make it easy for us to understand what you were trying to do and what went wrong.
+Provide as much context as possible so we can try to recreate the issue.
+
+### Discussion
+
+Please use the project's developer email list to engage our community:
+[dev@openwhisk.incubator.apache.org](dev@openwhisk.incubator.apache.org)
+
+In addition, we provide a "dev" Slack team channel for conversations at:
+https://openwhisk-team.slack.com/messages/dev/
+
+### Coding standards
+
+Please ensure you follow the coding standards used throughout the existing
+code base. Some basic rules include:
+
+ - all files must have the Apache license in the header.
+ - all PRs must have passing builds for all operating systems.
diff --git a/LICENSE.txt b/LICENSE.txt
new file mode 100644
index 0000000..a2fe52f
--- /dev/null
+++ b/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright 2015-2016 IBM Corporation
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/README.md b/README.md
index 2a20c71..4ac8d7e 100644
--- a/README.md
+++ b/README.md
@@ -1,2 +1,60 @@
-# openwhisk-package-deploy
-deploy from github repo
+# Using the Deploy Package
+
+The `/whisk.system/deploy` package offers a convenient way for you to describe and deploy any part of the OpenWhisk programming model using a Manifest file written in YAML.
+
+The package includes the following actions.
+
+| Entity | Type | Parameters | Description |
+| --- | --- | --- | --- |
+| `/whisk.system/deploy` | package | | Package to deploy OpenWhisk programming model elements |
+| `/whisk.system/deploy/wskdeploy` | action | gitUrl, manifestPath, envData | Deploy from github repositories with the appropriate structure and a defining manifest. |
+
+## wskdeploy Parameters
+The `/whisk.system/deploy/wskdeploy` package deploys OpenWhisk assets from a github repository with a defining manifest. The parameters are as follows:
+- `gitUrl`: A string specifying the location of the github repository containing the assets to be deployed. For example: `https://github.com/ibm-functions/blueprint-cloudant-trigger`
+
+- `manifestPath`: Optional. A string specifying the location of the folder enclosing the manifest.yaml file. For example: `src/openwhisk`. If this parameter is not provided, it will default to the root of the github repo.
+
+- `envData`: Optional. A string with a json object providing any optional enviroment data specified by the manifest.yaml file. For example:
+ ```
+ "{
+ "CLOUDANT_HOSTNAME": "some-hostname-bluemix.cloudant.com",
+ "CLOUDANT_USERNAME": "some-username",
+ "CLOUDANT_PASSWORD": "my-password",
+ "CLOUDANT_DATABASE": "database-name"
+ }"
+ ```
+
+
+## Setting up your Repository
+
+A simple hello world example of a deployable github repository can be found [here](https://github.com/ibm-functions/blueprint-hello-world/).
+
+A more complex example of a deployable github repository, including a trigger, a sequence, and cloudant credentials can be found [here](https://github.com/ibm-functions/blueprint-cloudant-trigger).
+
+1. Create a github repository with a manifest.yaml at its root, and an actions directory containing any source files.
+* actions
+ * my\_action\_name.js
+* manifest.yaml
+
+If you would like the manifest.yaml file to be in a different location, you can do so, but you'll need to pass in the optional manifestPath parameter to let wskdeploy know where the file is.
+
+* src
+ * ...
+ * manifest.yaml
+* test
+
+2. Please see the above referenced repositories for samples of the manifest.yaml. The manifest.yaml describes the OpenWhisk elements to be created. There is a great guide for writing manifests [here](https://github.com/apache/incubator-openwhisk-wskdeploy/blob/master/docs/programming_guide.md#wskdeploy-utility-by-example).
+
+
+## Run the wskdeploy command
+
+With the repository created, you can now deploy from it.
+
+- For the most simple manifests, with no associated services you can run the command with a gitUrl parameter and a manifestPath parameter which tells wskdeploy which language you want from your project.
+
+ ```
+ wsk action invoke /whisk.system/deploy/wskdeploy
+ -p gitUrl https://github.com/ibm-functions/blueprint-hello-world/
+ -p manifestPath "src/openwhisk"
+ ```
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
new file mode 100644
index 0000000..7a3265e
Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
new file mode 100644
index 0000000..f16d266
--- /dev/null
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -0,0 +1,5 @@
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-bin.zip
diff --git a/gradlew b/gradlew
new file mode 100755
index 0000000..f48d5d0
--- /dev/null
+++ b/gradlew
@@ -0,0 +1,170 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+## Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+ ls=`ls -ld "$PRG"`
+ link=`expr "$ls" : '.*-> \(.*\)$'`
+ if expr "$link" : '/.*' > /dev/null; then
+ PRG="$link"
+ else
+ PRG=`dirname "$PRG"`"/$link"
+ fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+ echo "$*"
+}
+
+die () {
+ echo
+ echo "$*"
+ echo
+ exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+ CYGWIN* )
+ cygwin=true
+ ;;
+ Darwin* )
+ darwin=true
+ ;;
+ MINGW* )
+ msys=true
+ ;;
+ NONSTOP* )
+ nonstop=true
+ ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+ if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+ # IBM's JDK on AIX uses strange locations for the executables
+ JAVACMD="$JAVA_HOME/jre/sh/java"
+ else
+ JAVACMD="$JAVA_HOME/bin/java"
+ fi
+ if [ ! -x "$JAVACMD" ] ; then
+ die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+ fi
+else
+ JAVACMD="java"
+ which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+ MAX_FD_LIMIT=`ulimit -H -n`
+ if [ $? -eq 0 ] ; then
+ if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+ MAX_FD="$MAX_FD_LIMIT"
+ fi
+ ulimit -n $MAX_FD
+ if [ $? -ne 0 ] ; then
+ warn "Could not set maximum file descriptor limit: $MAX_FD"
+ fi
+ else
+ warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+ fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+ GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+ APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+ CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+ JAVACMD=`cygpath --unix "$JAVACMD"`
+
+ # We build the pattern for arguments to be converted via cygpath
+ ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+ SEP=""
+ for dir in $ROOTDIRSRAW ; do
+ ROOTDIRS="$ROOTDIRS$SEP$dir"
+ SEP="|"
+ done
+ OURCYGPATTERN="(^($ROOTDIRS))"
+ # Add a user-defined pattern to the cygpath arguments
+ if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+ OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+ fi
+ # Now convert the arguments - kludge to limit ourselves to /bin/sh
+ i=0
+ for arg in "$@" ; do
+ CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+ CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
+
+ if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
+ eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+ else
+ eval `echo args$i`="\"$arg\""
+ fi
+ i=$((i+1))
+ done
+ case $i in
+ (0) set -- ;;
+ (1) set -- "$args0" ;;
+ (2) set -- "$args0" "$args1" ;;
+ (3) set -- "$args0" "$args1" "$args2" ;;
+ (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+ (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+ (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+ (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+ (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+ (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+ esac
+fi
+
+# Escape application args
+save () {
+ for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+ echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+ cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
new file mode 100644
index 0000000..f955316
--- /dev/null
+++ b/gradlew.bat
@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega
diff --git a/packages/actions/deploy.js b/packages/actions/deploy.js
new file mode 100644
index 0000000..8794c04
--- /dev/null
+++ b/packages/actions/deploy.js
@@ -0,0 +1,170 @@
+const fs = require('fs');
+const path = require('path');
+const exec = require('child_process').exec;
+const git = require('simple-git');
+const yaml = require('js-yaml');
+
+let command = '';
+
+/**
+ * Action to deploy openwhisk elements from a compliant repository
+ * @param {string} gitUrl - github url containing the manifest and elements to deploy
+ * @param {string} manifestPath - (optional) the path to the manifest file, e.g. "openwhisk/src"
+ * @param {object} envData - (optional) some specific details such as cloudant username or cloudant password
+ * @return {object} Promise
+ */
+function main(params) {
+ return new Promise((resolve, reject) => {
+ // Grab optional envData and manifestPath params for wskdeploy
+ let {
+ envData,
+ manifestPath,
+ gitUrl
+ } = params;
+
+ // confirm gitUrl was provided as a parameter
+ if (!gitUrl) {
+ reject({
+ error: 'Please enter the GitHub repo url in params',
+ });
+ }
+
+ // if no manifestPath was provided, use current directory
+ if (!manifestPath) {
+ manifestPath = '.';
+ }
+ // Grab wsp api host and auth from params, or process.env
+ const { wskApiHost, wskAuth } = getWskApiAuth(params);
+
+ // Extract the name of the repo for the tmp directory
+ const repoSplit = params.gitUrl.split('/');
+ const repoName = repoSplit[repoSplit.length - 1];
+ const localDirName = `${__dirname}/tmp/${repoName}`;
+ return git()
+ .clone(gitUrl, localDirName, ['--depth', '1'], (err, data) => {
+ if (err) {
+ reject('There was a problem cloning from github. Does that github repo exist? Does it begin with http?', err);
+ }
+ resolve({
+ repoDir: localDirName,
+ manifestPath,
+ manifestFileName: 'manifest.yaml',
+ wskAuth,
+ wskApiHost,
+ envData,
+ });
+ });
+ })
+ .then((data) => {
+ const {
+ wskAuth,
+ wskApiHost,
+ manifestPath,
+ manifestFileName,
+ repoDir,
+ envData,
+ } = data;
+
+ // Set the cwd of the command to be where the manifest/actions live
+ const execOptions = {
+ cwd: `${repoDir}/${manifestPath}`,
+ };
+
+ // If we were passed environment data (Cloudant bindings, etc.) add it to the options for `exec`
+ if (envData) {
+ execOptions.env = envData;
+ } else {
+ execOptions.env = {};
+ }
+
+ // Send 'y' to the wskdeploy command so it will actually run the deployment
+ command = `printf 'y' | ${__dirname}/wskdeploy -v -m ${manifestFileName} --auth ${wskAuth} --apihost ${wskApiHost}`;
+
+ return new Promise((resolve, reject) => {
+ const manifestFilePath = `${repoDir}/${manifestPath}/${manifestFileName}`
+ if (!fs.existsSync(manifestFilePath)) {
+ reject(`Error loading ${manifestFilePath}. Does a manifest file exist?`);
+ } else {
+ exec(command, execOptions, (err, stdout, stderr) => {
+ deleteFolder(repoDir);
+ if (err) {
+ reject('Error running `./wskdeploy`: ', err);
+ }
+ if (stdout) {
+ console.log('stdout from wskDeploy: ', stdout, ' type ', typeof stdout);
+
+ if (typeof stdout === 'string') {
+ try {
+ stdout = JSON.parse(stdout);
+ } catch (e) {
+ console.log('Failed to parse stdout, it wasn\'t a JSON object');
+ }
+ }
+
+ if (typeof stdout === 'object') {
+ if (stdout.error) {
+ stdout.descriptiveError = 'Could not successfully run wskdeploy. Please run again with the verbose flag, -v.';
+ reject(stdout);
+ }
+ }
+ }
+ if (stderr) {
+ console.log('stderr from wskDeploy: ', stderr);
+ reject(stderr);
+ }
+ console.log('Finished! Resolving now');
+ resolve({
+ status: 'success',
+ success: true,
+ });
+ });
+ }
+ })
+ });
+}
+
+/**
+ * Checks if wsk API host and auth were provided in params, if not, gets them from process.env
+ * @param {[Object]} params [Params object]
+ * @return {[Object]} [Object containing wskApiHost and wskAuth]
+ */
+function getWskApiAuth(params) {
+ let {
+ wskApiHost,
+ wskAuth,
+ } = params;
+
+ if (!wskApiHost) {
+ wskApiHost = process.env.__OW_API_HOST;
+ }
+
+ if (!wskAuth) {
+ wskAuth = process.env.__OW_API_KEY;
+ }
+
+ return {
+ wskApiHost,
+ wskAuth,
+ };
+}
+
+/**
+ * recursive funciton to delete a folder, must first delete items inside.
+ * @param {string} pathToDelete inclusive path to folder to delete
+ */
+function deleteFolder(pathToDelete) {
+ if (fs.existsSync(pathToDelete)) {
+ fs.readdirSync(pathToDelete).forEach(function(file, index){
+ var curPath = path.join(pathToDelete, file);
+ if (fs.lstatSync(curPath).isDirectory()) {
+ deleteFolder(curPath);
+ } else {
+ //unlinkSync deletes files.
+ fs.unlinkSync(curPath);
+ }
+ });
+ fs.rmdirSync(pathToDelete);
+ }
+};
+
+exports.main = main;
diff --git a/packages/actions/package.json b/packages/actions/package.json
new file mode 100644
index 0000000..bb754e4
--- /dev/null
+++ b/packages/actions/package.json
@@ -0,0 +1,16 @@
+{
+ "name": "deploy-action",
+ "version": "1.0.0",
+ "description": "",
+ "main": "deploy.js",
+ "scripts": {
+ "test": "echo \"Error: no test specified\" && exit 1"
+ },
+ "keywords": [],
+ "author": "",
+ "license": "ISC",
+ "dependencies": {
+ "js-yaml": "^3.9.1",
+ "simple-git": "^1.74.1"
+ }
+}
diff --git a/packages/installCatalog.sh b/packages/installCatalog.sh
new file mode 100755
index 0000000..6516869
--- /dev/null
+++ b/packages/installCatalog.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+#
+# use the command line interface to install standard actions deployed
+# automatically
+#
+# To run this command
+# ./installCatalog.sh <authkey> <edgehost> <apihost> <workers>
+
+set -e
+set -x
+
+: ${OPENWHISK_HOME:?"OPENWHISK_HOME must be set and non-empty"}
+WSK_CLI="$OPENWHISK_HOME/bin/wsk"
+
+if [ $# -eq 0 ]
+then
+echo "Usage: ./installCatalog.sh <authkey> <edgehost> <apihost>"
+fi
+
+AUTH="$1"
+EDGEHOST="$2"
+APIHOST="$3"
+
+# If the auth key file exists, read the key in the file. Otherwise, take the
+# first argument as the key itself.
+if [ -f "$AUTH" ]; then
+ AUTH=`cat $AUTH`
+fi
+
+# Make sure that the EDGEHOST is not empty.
+: ${EDGEHOST:?"EDGEHOST must be set and non-empty"}
+
+# Make sure that the APIHOST is not empty.
+: ${APIHOST:?"APIHOST must be set and non-empty"}
+
+PACKAGE_HOME="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+export WSK_CONFIG_FILE= # override local property file to avoid namespace clashes
+
+echo Installing Deploy package.
+
+$WSK_CLI -i --apihost "$EDGEHOST" package update --auth "$AUTH" --shared yes deploy \
+ -a description 'Alarms and periodic utility' \
+ -a parameters '[ {"message":"theMessage", "required":true} ]' \
+ -p apihost "$APIHOST" \
+ -p trigger_payload ''
+
+$WSK_CLI -i --apihost "$EDGEHOST" action update --auth "$AUTH" deploy/wskdeploy "$PACKAGE_HOME/actions/deploy.js" \
+ -a description 'Creates an action that allows you to run wskdeploy from OpenWhisk' \
+ -a parameters '[ {"name":"gitUrl", "required":true, "bindTime":true, "description": "The URL to the GitHub repository to deploy"}, {"name":"manifestPath", "required":false, "bindTime":true, "description": "The relative path to the manifest file from the GitHub repo root"},{"name":"wskApiHost", "required":false, "description": "The URL of the OpenWhisk api host you want to use"}, {"name":"envData", "required":false, "description": "Blueprint-specific environment data object"} ]' \
+ -a sampleInput '{"gitUrl":"github.com/my_blueprint", "manifestPath":"runtimes/swift", "wskApiHost":"openwhisk.stage1.ng.bluemix.net", "envData": "{\"KAFKA_ADMIN_URL\":\"https://my_kafka_service\", \"MESSAGEHUB_USER\":\"MY_MESSAGEHUB_USERNAME\"}"}' \
+ --docker "openwhisk/wskdeploy:0.8.9.2"
diff --git a/packages/uninstall.sh b/packages/uninstall.sh
new file mode 100755
index 0000000..6e9c7ef
--- /dev/null
+++ b/packages/uninstall.sh
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+set -e
+set -x
+: ${OPENWHISK_HOME:?"OPENWHISK_HOME must be set and non-empty"}
+WSK_CLI="$OPENWHISK_HOME/bin/wsk"
+
+if [ $# -eq 0 ]
+then
+ echo "Usage: ./uninstall.sh $APIHOST $AUTH"
+fi
+
+APIHOST="$1"
+AUTH="$2"
+
+echo Uninstalling Template Package \
+
+$WSK_CLI --apihost $APIHOST action delete -i --auth $AUTH deploy/wskdeploy
+
+$WSK_CLI --apihost $APIHOST package delete -i --auth $AUTH deploy
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 0000000..5f35251
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,16 @@
+def owPath = System.getenv("OPENWHISK_HOME") ?: '../open'
+def owDirectory = new File(owPath)
+
+include 'common:scala'; project(':common:scala').projectDir = new File(owDirectory, 'common/scala')
+include 'core:controller'; project(':core:controller').projectDir = new File(owDirectory, 'core/controller')
+include 'core:invoker'; project(':core:invoker').projectDir = new File(owDirectory, 'core/invoker')
+include 'whisktests'; project(':whisktests').projectDir = new File(owDirectory, 'tests')
+
+include 'tests'
+
+rootProject.name = 'openwhisk-package-deploy'
+
+gradle.ext.scala = [
+ version: '2.11.8',
+ compileFlags: ['-feature', '-unchecked', '-deprecation', '-Xfatal-warnings', '-Ywarn-unused-import']
+]
diff --git a/tests/build.gradle b/tests/build.gradle
new file mode 100644
index 0000000..124229c
--- /dev/null
+++ b/tests/build.gradle
@@ -0,0 +1,28 @@
+apply plugin: 'scala'
+apply plugin: 'eclipse'
+compileTestScala.options.encoding = 'UTF-8'
+
+evaluationDependsOn(':whisktests')
+
+repositories {
+ mavenCentral()
+}
+
+tasks.withType(Test) {
+ testLogging {
+ events "passed", "skipped", "failed"
+ showStandardStreams = true
+ exceptionFormat = 'full'
+ }
+ outputs.upToDateWhen { false } // force tests to run every time
+}
+
+dependencies {
+ compile "org.scala-lang:scala-library:${gradle.scala.version}"
+ compile project(':whisktests')
+ compile project(':whisktests').sourceSets.test.output
+}
+
+tasks.withType(ScalaCompile) {
+ scalaCompileOptions.additionalParameters = gradle.scala.compileFlags
+}
diff --git a/tests/credentials.json.enc b/tests/credentials.json.enc
new file mode 100644
index 0000000..aef8732
Binary files /dev/null and b/tests/credentials.json.enc differ
diff --git a/tests/src/test/scala/packages/DeployTests.scala b/tests/src/test/scala/packages/DeployTests.scala
new file mode 100644
index 0000000..8ce0aef
--- /dev/null
+++ b/tests/src/test/scala/packages/DeployTests.scala
@@ -0,0 +1,155 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package packages
+
+
+import org.junit.runner.RunWith
+import org.scalatest.BeforeAndAfterAll
+import org.scalatest.junit.JUnitRunner
+import common._
+import spray.json.DefaultJsonProtocol._
+import spray.json._
+
+@RunWith(classOf[JUnitRunner])
+class DeployTests extends TestHelpers
+ with WskTestHelpers
+ with BeforeAndAfterAll {
+
+ implicit val wskprops = WskProps()
+ val wsk = new Wsk()
+
+ //set parameters for deploy tests
+ val deployTestRepo = "https://github.com/beemarie/openwhisk-package-deploy"
+ val incorrectGithubRepo = "https://github.com/beemarie/openwhisk-package-deploy-incorrect"
+ val malformedRepoUrl = "github.com/ibm-functions/blueprint-hello-world"
+ val helloWorldPath = "tests/src/test/scala/testFixtures/helloWorld"
+ val helloWorldWithNoManifest = "tests/src/stest/scala/testFixtures/helloWorldNoManifest"
+ val helloWorldPackageParam = "tests/src/test/scala/testFixtures/helloWorldPackageParam"
+ val incorrectManifestPath = "does/not/exist"
+ val uselessEnvData = """{ "something": "useless" }"""
+ val packageEnvData = """{ "PACKAGE_NAME": "myPackage" }"""
+ val deployAction = "/whisk.system/deploy/wskdeploy"
+ val helloWorldAction = "openwhisk-helloworld/helloworld"
+ val helloWorldActionPackage = "myPackage/helloworld"
+
+ //test to create the hello world blueprint from github
+ "Deploy Package" should "create the hello world action from github url" in {
+ val run = wsk.action.invoke(deployAction, Map(
+ "gitUrl" -> deployTestRepo.toJson,
+ "manifestPath" -> helloWorldPath.toJson))
+ withActivation(wsk.activation, run) {
+ activation =>
+ activation.response.success shouldBe true
+ val logs = activation.logs.get.toString
+ logs should include(s"Action $helloWorldAction has been successfully deployed.")
+ }
+ // clean up after test
+ wsk.action.delete(helloWorldAction)
+ }
+
+ //test to create the hello world blueprint from github with myPackage as package name
+ "Deploy Package" should s"create the $helloWorldActionPackage action from github url" in {
+ val run = wsk.action.invoke(deployAction, Map(
+ "gitUrl" -> deployTestRepo.toJson,
+ "manifestPath" -> helloWorldPackageParam.toJson,
+ "envData" -> packageEnvData.parseJson))
+ withActivation(wsk.activation, run) {
+ activation =>
+ activation.response.success shouldBe true
+ val logs = activation.logs.get.toString
+ logs should include(s"Action $helloWorldActionPackage has been successfully deployed.")
+ }
+ // clean up after test
+ wsk.action.delete(helloWorldActionPackage)
+ }
+
+ //test to create a blueprint with no github repo provided
+ "Deploy Package" should "return error if there is no github repo provided" in {
+ val run = wsk.action.invoke(deployAction, Map(
+ "manifestPath" -> helloWorldPath.toJson))
+ withActivation(wsk.activation, run) {
+ activation =>
+ activation.response.success shouldBe false
+ activation.response.result.get.toString should include("Please enter the GitHub repo url in params")
+ }
+ }
+
+ //test to create a blueprint with a nonexistant github repo provided
+ "Deploy Package" should "return error if there is an nonexistant repo provided" in {
+ val run = wsk.action.invoke(deployAction, Map(
+ "gitUrl" -> incorrectGithubRepo.toJson,
+ "manifestPath" -> helloWorldPath.toJson))
+ withActivation(wsk.activation, run) {
+ activation =>
+ activation.response.success shouldBe false
+ activation.response.result.get.toString should include("There was a problem cloning from github.")
+ }
+ }
+
+ //test to create a blueprint with a malformed github repo
+ "Deploy Package" should "return error if there is a malformed gitUrl provided" in {
+ val run = wsk.action.invoke(deployAction, Map(
+ "gitUrl" -> malformedRepoUrl.toJson,
+ "manifestPath" -> helloWorldPath.toJson))
+ withActivation(wsk.activation, run) {
+ activation =>
+ activation.response.success shouldBe false
+ activation.response.result.get.toString should include("There was a problem cloning from github.")
+ }
+ }
+
+ //test to create a blueprint with useless EnvData provided
+ "Deploy Package" should "return succeed if useless envData is provided" in {
+ val run = wsk.action.invoke(deployAction, Map(
+ "gitUrl" -> deployTestRepo.toJson,
+ "manifestPath" -> helloWorldPath.toJson,
+ "envData" -> uselessEnvData.parseJson))
+ withActivation(wsk.activation, run) {
+ activation =>
+ activation.response.success shouldBe true
+ val logs = activation.logs.get.toString
+ logs should include(s"Action $helloWorldAction has been successfully deployed.")
+ }
+ // clean up after test
+ wsk.action.delete(helloWorldAction)
+ }
+
+ //test to create a blueprint with an incorrect manifestPath provided
+ "Deploy Package" should "return with failure if incorrect manifestPath is provided" in {
+ val run = wsk.action.invoke(deployAction, Map(
+ "gitUrl" -> deployTestRepo.toJson,
+ "manifestPath" -> incorrectManifestPath.toJson))
+ withActivation(wsk.activation, run) {
+ activation =>
+ activation.response.success shouldBe false
+ activation.response.result.get.toString should include("Does a manifest file exist?")
+ }
+ }
+
+ //test to create a blueprint with manifestPath provided, but no manifestFile existing
+ "Deploy Package" should "return with failure if no manifest exists at manifestPath" in {
+ val run = wsk.action.invoke(deployAction, Map(
+ "gitUrl" -> deployTestRepo.toJson,
+ "manifestPath" -> helloWorldWithNoManifest.toJson))
+ withActivation(wsk.activation, run) {
+ activation =>
+ activation.response.success shouldBe false
+ activation.response.result.get.toString should include("Does a manifest file exist?")
+ }
+ }
+}
diff --git a/tests/src/test/scala/testFixtures/helloWorld/actions/helloworld.js b/tests/src/test/scala/testFixtures/helloWorld/actions/helloworld.js
new file mode 100644
index 0000000..a34e766
--- /dev/null
+++ b/tests/src/test/scala/testFixtures/helloWorld/actions/helloworld.js
@@ -0,0 +1,17 @@
+/**
+ *
+ * main() will be invoked when you Run This Action.
+ *
+ * @param Cloud Functions actions accept a single parameter,
+ * which must be a JSON object.
+ *
+ * In this case, the params variable will look like:
+ * { "message": "xxxx" }
+ *
+ * @return which must be a JSON object.
+ * It will be the output of this action.
+ *
+ */
+function main(params) {
+ return { "message": "you sent me " + params.message };
+}
diff --git a/tests/src/test/scala/testFixtures/helloWorld/manifest.yaml b/tests/src/test/scala/testFixtures/helloWorld/manifest.yaml
new file mode 100644
index 0000000..4bcab16
--- /dev/null
+++ b/tests/src/test/scala/testFixtures/helloWorld/manifest.yaml
@@ -0,0 +1,14 @@
+# Wskdeploy manifest for hello-world
+
+# Deployment using this manifest file creates the following OpenWhisk components:
+# Package: openwhisk-helloworld
+# Action: openwhisk-helloworld/helloworld.js
+
+packages:
+ openwhisk-helloworld:
+ version: 1.0
+ license: Apache-2.0
+ namespace: _
+ actions:
+ helloworld:
+ function: actions/helloworld.js
diff --git a/tests/src/test/scala/testFixtures/helloWorldNoManifest/actions/helloworld.js b/tests/src/test/scala/testFixtures/helloWorldNoManifest/actions/helloworld.js
new file mode 100644
index 0000000..a34e766
--- /dev/null
+++ b/tests/src/test/scala/testFixtures/helloWorldNoManifest/actions/helloworld.js
@@ -0,0 +1,17 @@
+/**
+ *
+ * main() will be invoked when you Run This Action.
+ *
+ * @param Cloud Functions actions accept a single parameter,
+ * which must be a JSON object.
+ *
+ * In this case, the params variable will look like:
+ * { "message": "xxxx" }
+ *
+ * @return which must be a JSON object.
+ * It will be the output of this action.
+ *
+ */
+function main(params) {
+ return { "message": "you sent me " + params.message };
+}
diff --git a/tests/src/test/scala/testFixtures/helloWorldPackageParam/actions/helloworld.js b/tests/src/test/scala/testFixtures/helloWorldPackageParam/actions/helloworld.js
new file mode 100644
index 0000000..a34e766
--- /dev/null
+++ b/tests/src/test/scala/testFixtures/helloWorldPackageParam/actions/helloworld.js
@@ -0,0 +1,17 @@
+/**
+ *
+ * main() will be invoked when you Run This Action.
+ *
+ * @param Cloud Functions actions accept a single parameter,
+ * which must be a JSON object.
+ *
+ * In this case, the params variable will look like:
+ * { "message": "xxxx" }
+ *
+ * @return which must be a JSON object.
+ * It will be the output of this action.
+ *
+ */
+function main(params) {
+ return { "message": "you sent me " + params.message };
+}
diff --git a/tests/src/test/scala/testFixtures/helloWorldPackageParam/manifest.yaml b/tests/src/test/scala/testFixtures/helloWorldPackageParam/manifest.yaml
new file mode 100644
index 0000000..7844626
--- /dev/null
+++ b/tests/src/test/scala/testFixtures/helloWorldPackageParam/manifest.yaml
@@ -0,0 +1,14 @@
+# Wskdeploy manifest for hello-world
+
+# Deployment using this manifest file creates the following OpenWhisk components:
+# Package: openwhisk-helloworld
+# Action: openwhisk-helloworld/helloworld.js
+
+packages:
+ $PACKAGE_NAME:
+ version: 1.0
+ license: Apache-2.0
+ namespace: _
+ actions:
+ helloworld:
+ function: actions/helloworld.js
diff --git a/tools/travis/build.sh b/tools/travis/build.sh
new file mode 100755
index 0000000..866669d
--- /dev/null
+++ b/tools/travis/build.sh
@@ -0,0 +1,54 @@
+#!/bin/bash
+# Build script for Travis-CI.
+
+SCRIPTDIR=$(cd $(dirname "$0") && pwd)
+ROOTDIR="$SCRIPTDIR/../.."
+WHISKDIR="$ROOTDIR/openwhisk"
+
+cd $WHISKDIR
+
+tools/build/scanCode.py $ROOTDIR
+
+# No point to continue with PRs, since encryption is on
+if [ "$TRAVIS_PULL_REQUEST" != "false" ]; then exit 0; fi
+
+cd $WHISKDIR/ansible
+
+ANSIBLE_CMD="ansible-playbook -i environments/local"
+
+$ANSIBLE_CMD setup.yml
+$ANSIBLE_CMD prereq.yml
+$ANSIBLE_CMD couchdb.yml
+$ANSIBLE_CMD initdb.yml
+
+cd $WHISKDIR
+
+./gradlew distDocker
+
+cd $WHISKDIR/ansible
+
+$ANSIBLE_CMD wipe.yml
+$ANSIBLE_CMD openwhisk.yml
+
+cd $WHISKDIR
+
+VCAP_SERVICES_FILE="$(readlink -f $WHISKDIR/../tests/credentials.json)"
+
+#update whisk.properties to add tests/credentials.json file to vcap.services.file, which is needed in tests
+WHISKPROPS_FILE="$WHISKDIR/whisk.properties"
+sed -i 's:^[ \t]*vcap.services.file[ \t]*=\([ \t]*.*\)$:vcap.services.file='$VCAP_SERVICES_FILE':' $WHISKPROPS_FILE
+cat whisk.properties
+
+WSK_CLI=$WHISKDIR/bin/wsk
+AUTH_KEY=$(cat $WHISKDIR/ansible/files/auth.whisk.system)
+EDGE_HOST=$(grep '^edge.host=' $WHISKPROPS_FILE | cut -d'=' -f2)
+
+# Set Environment
+export OPENWHISK_HOME=$WHISKDIR
+
+# Install the package
+source $ROOTDIR/packages/installCatalog.sh $AUTH_KEY $EDGE_HOST $WSK_CLI
+
+# Test
+cd $ROOTDIR
+./gradlew :tests:test
--
To stop receiving notification emails like this one, please contact
"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>.