[GitHub] beemarie closed pull request #24: Manifest fix for mainwhiskpackages build and wskdeploy update

[GitBox <gi...@apache.org>]

beemarie closed pull request #24: Manifest fix for mainwhiskpackages build and wskdeploy update
URL: https://github.com/apache/incubator-openwhisk-package-deploy/pull/24
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/.travis.yml b/.travis.yml
index 536aab7..d680712 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,7 @@ notifications:
 install: true
 
 before_install:
+  - npm conf set strict-ssl false
   - ./tools/travis/setup.sh
 
 script:
diff --git a/README.md b/README.md
index e75fbc6..9e49fd3 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ With the repository created, you can now deploy from it.
 1. `git clone https://github.com/openwhisk/incubator-openwhisk-package-deploy`
 2. `cd incubator-openwhisk-package-deploy/packages`
 3. `./installCatalog.sh AUTH EDGE_HOST WSK_CLI DOCKER`
-   AUTH is your auth key.  EDGE_HOST is the OpenWhisk hostname.  WSK_CLI is location of the Openwhisk CLI binary. DOCKER is an optional param for the desired `wskdeploy` docker image, resolves to `openwhisk/wskdeploy:0.9.0` by default.
+   AUTH is your auth key.  EDGE_HOST is the OpenWhisk hostname.  WSK_CLI is location of the Openwhisk CLI binary. DOCKER is an optional param for the desired `wskdeploy` docker image, resolves to `openwhisk/wskdeploy:0.9.3` by default.
 
 > You can also remove the package using `uninstall.sh` in a similar fashion like so:
 > `./uninstall.sh AUTH EDGE_HOST WSK_CLI`
diff --git a/packages/installCatalog.sh b/packages/installCatalog.sh
index 84b5aa0..6b98794 100755
--- a/packages/installCatalog.sh
+++ b/packages/installCatalog.sh
@@ -25,7 +25,7 @@ INSTALL_WEB_ONLY="${INSTALL_WEB_ONLY:-True}"
 # If docker is not provided, set to default version.
 if [ -z "$4" ]
   then
-    DOCKER="openwhisk/wskdeploy:0.9.0"
+    DOCKER="openwhisk/wskdeploy:0.9.3"
 fi
 
 # If the auth key file exists, read the key in the file. Otherwise, take the
diff --git a/tests/src/test/scala/testFixtures/helloWorld/manifest.yaml b/tests/src/test/scala/testFixtures/helloWorld/manifest.yaml
index 4bcab16..1c2659b 100644
--- a/tests/src/test/scala/testFixtures/helloWorld/manifest.yaml
+++ b/tests/src/test/scala/testFixtures/helloWorld/manifest.yaml
@@ -4,11 +4,12 @@
 #   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
+project:
+  namespace: _
+  packages:
+    openwhisk-helloworld:
+      version: 1.0
+      license: Apache-2.0
+      actions:
+        helloworld:
+          function: actions/helloworld.js
diff --git a/tests/src/test/scala/testFixtures/helloWorldPackageParam/manifest.yaml b/tests/src/test/scala/testFixtures/helloWorldPackageParam/manifest.yaml
index 7844626..37e2128 100644
--- a/tests/src/test/scala/testFixtures/helloWorldPackageParam/manifest.yaml
+++ b/tests/src/test/scala/testFixtures/helloWorldPackageParam/manifest.yaml
@@ -4,11 +4,12 @@
 #   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
+project:
+  namespace: _
+  packages:
+    $PACKAGE_NAME:
+      version: 1.0
+      license: Apache-2.0
+      actions:
+        helloworld:
+          function: actions/helloworld.js


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services