This is an automated email from the ASF dual-hosted git repository.
japetrsn pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git
The following commit(s) were added to refs/heads/master by this push:
new 5d440fe Restore nodejs:6 as default. (#4264)
5d440fe is described below
commit 5d440fe2ce26792f424acff94d9c04b3a540979b
Author: rodric rabbah <[email protected]>
AuthorDate: Mon Feb 11 12:52:57 2019 -0500
Restore nodejs:6 as default. (#4264)
* Restore nodejs:6 as default. See
https://github.com/apache/incubator-openwhisk-catalog/issues/294 for details.
* Relax test.
---
ansible/files/runtimes.json | 4 ++--
.../scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala | 3 ++-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/ansible/files/runtimes.json b/ansible/files/runtimes.json
index c3e80d3..782037d 100644
--- a/ansible/files/runtimes.json
+++ b/ansible/files/runtimes.json
@@ -3,7 +3,7 @@
"nodejs": [
{
"kind": "nodejs:6",
- "default": false,
+ "default": true,
"image": {
"prefix": "openwhisk",
"name": "nodejs6action",
@@ -37,7 +37,7 @@
},
{
"kind": "nodejs:10",
- "default": true,
+ "default": false,
"image": {
"prefix": "openwhisk",
"name": "action-nodejs-v10",
diff --git
a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala
b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala
index 1974008..802c0a2 100644
---
a/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala
+++
b/tests/src/test/scala/org/apache/openwhisk/core/entity/test/SchemaTests.scala
@@ -476,7 +476,8 @@ class SchemaTests extends FlatSpec with BeforeAndAfter with
ExecHelpers with Mat
it should "initialize exec manifest" in {
val runtimes = ExecManifest.runtimesManifest
- runtimes.resolveDefaultRuntime("nodejs:default").get.kind shouldBe
"nodejs:10"
+ val kind = runtimes.resolveDefaultRuntime("nodejs:default").get.kind
+ Some(kind) should contain oneOf ("nodejs:6", "nodejs:8", "nodejs:10")
}
it should "properly deserialize and reserialize JSON" in {
