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.
apache · Sep 25, 2019 · 32c71d6 · 32c71d6
1 parent f33d916
commit 32c71d6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 1 deletion.
diff --git 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
@@ -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": [