You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openwhisk.apache.org by dg...@apache.org on 2019/09/25 14:02:55 UTC
[openwhisk-deploy-kube] branch master updated: install package
catalog using `wsk project deploy` (#484)
This is an automated email from the ASF dual-hosted git repository.
dgrove pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/openwhisk-deploy-kube.git
The following commit(s) were added to refs/heads/master by this push:
new 32c71d6 install package catalog using `wsk project deploy` (#484)
32c71d6 is described below
commit 32c71d68ec57b922475be1c6174e23682cfa2277
Author: David Grove <dg...@users.noreply.github.com>
AuthorDate: Wed Sep 25 10:02:50 2019 -0400
install package catalog using `wsk project deploy` (#484)
1. install package catalog using `wsk project deploy`
2. include Swift in runtimes-minimal-travis.json
because wskdeploy validates that the runtime is actually supported
by the target system when deploying actions. Therefore to
install the samples package from the wsk catalog, the minimal
runtimes used for TravisCI must include Swift.
---
helm/openwhisk/configMapFiles/installPackages/myTask.sh | 2 +-
helm/openwhisk/runtimes-minimal-travis.json | 16 ++++++++++++++++
2 files changed, 17 insertions(+), 1 deletion(-)
diff --git a/helm/openwhisk/configMapFiles/installPackages/myTask.sh b/helm/openwhisk/configMapFiles/installPackages/myTask.sh
index cb48351..04691d8 100644
--- a/helm/openwhisk/configMapFiles/installPackages/myTask.sh
+++ b/helm/openwhisk/configMapFiles/installPackages/myTask.sh
@@ -79,7 +79,7 @@ pushd openwhisk-catalog
popd
pushd openwhisk-catalog/packages
- ./installCatalog.sh $WHISK_AUTH $WHISK_API_HOST /usr/local/bin/wsk || exit 1
+ ./installCatalogUsingWskdeploy.sh $WHISK_AUTH $WHISK_API_HOST /usr/local/bin/wsk || exit 1
popd
diff --git a/helm/openwhisk/runtimes-minimal-travis.json b/helm/openwhisk/runtimes-minimal-travis.json
index e37bb55..76f7fcb 100644
--- a/helm/openwhisk/runtimes-minimal-travis.json
+++ b/helm/openwhisk/runtimes-minimal-travis.json
@@ -37,6 +37,22 @@
},
"deprecated": false
}
+ ],
+ "swift": [
+ {
+ "kind": "swift:4.2",
+ "default": true,
+ "image": {
+ "prefix": "openwhisk",
+ "name": "action-swift-v4.2",
+ "tag": "1.13.0-incubating"
+ },
+ "deprecated": false,
+ "attached": {
+ "attachmentName": "codefile",
+ "attachmentType": "text/plain"
+ }
+ }
]
},
"blackboxes": [