From 7c9ec1b2fd74ac33eb7791f89da74edd2daa938d Mon Sep 17 00:00:00 2001
From: falkzoll <falkzoll@de.ibm.com>
Date: Thu, 21 Sep 2023 12:12:54 +0200
Subject: [PATCH] Add nodejs:20, go:1.19 and go:1.21 to apiv1swagger and tests.
 (#164)

- Use the pre installed docker inside the github action.
- Deploy openwhisk in single mode instead of HA mode to reduce the memory and disk requirements in the github action.
---
 .github/workflows/run-tests.yml                              | 5 +++--
 core/controller/src/main/resources/apiv1swagger.json         | 3 +++
 .../org/apache/openwhisk/core/entity/test/SchemaTests.scala  | 2 +-
 tests/src/test/scala/system/rest/JsonSchemaTests.scala       | 2 +-
 tools/travis/setupPrereq.sh                                  | 3 ++-
 5 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
index 1b70a17ad25..ae34ff4e456 100644
--- a/.github/workflows/run-tests.yml
+++ b/.github/workflows/run-tests.yml
@@ -38,8 +38,9 @@ jobs:
           docker image rm $(docker image ls -q) -f
           df -h
 
-      - name: befor install -> docker.sh
-        run:  ./tools/travis/docker.sh
+      # We use the built in docker of the github action environment.
+      #- name: befor install -> docker.sh
+      #  run:  ./tools/travis/docker.sh
 
       - name: befor install -> install python3-pip
         run:  sudo apt-get install -y python3-pip
diff --git a/core/controller/src/main/resources/apiv1swagger.json b/core/controller/src/main/resources/apiv1swagger.json
index b8657910208..a4c4425062d 100644
--- a/core/controller/src/main/resources/apiv1swagger.json
+++ b/core/controller/src/main/resources/apiv1swagger.json
@@ -1895,6 +1895,7 @@
             "nodejs:10",
             "nodejs:12",
             "nodejs:16",
+            "nodejs:20",
             "nodejs:default",
             "php:7.3",
             "php:7.4",
@@ -1908,6 +1909,8 @@
             "go:1.11",
             "go:1.15",
             "go:1.17",
+            "go:1.19",
+            "go:1.21",
             "go:default",
             "sequence",
             "swift:4.2",
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 9a7f7eb948e..ee79fdb78a2 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
@@ -493,7 +493,7 @@ class SchemaTests extends FlatSpec with BeforeAndAfter with ExecHelpers with Mat
   it should "initialize exec manifest" in {
     val runtimes = ExecManifest.runtimesManifest
     val kind = runtimes.resolveDefaultRuntime("nodejs:default").get.kind
-    Some(kind) should contain oneOf ("nodejs:6", "nodejs:8", "nodejs:10", "nodejs:12", "nodejs:16")
+    Some(kind) should contain oneOf ("nodejs:6", "nodejs:8", "nodejs:10", "nodejs:12", "nodejs:16", "nodejs:20")
   }
 
   it should "properly deserialize and reserialize JSON" in {
diff --git a/tests/src/test/scala/system/rest/JsonSchemaTests.scala b/tests/src/test/scala/system/rest/JsonSchemaTests.scala
index 11847c24d07..86007af07e1 100644
--- a/tests/src/test/scala/system/rest/JsonSchemaTests.scala
+++ b/tests/src/test/scala/system/rest/JsonSchemaTests.scala
@@ -51,7 +51,7 @@ class JsonSchemaTests extends FlatSpec with Matchers with JsonSchema with RestUt
                        | "name":"foo",
                        | "version":"1.1.1",
                        | "publish":false,
-                       | "exec":{ "code": "foo", "kind": "nodejs:16" },
+                       | "exec":{ "code": "foo", "kind": "nodejs:20" },
                        | "parameters":["key1","value1"],
                        | "limits":{ "timeout":1000, "memory":200 } }""".stripMargin
     assert(check(ACTION, schema))
diff --git a/tools/travis/setupPrereq.sh b/tools/travis/setupPrereq.sh
index f820c283231..f551df679f7 100755
--- a/tools/travis/setupPrereq.sh
+++ b/tools/travis/setupPrereq.sh
@@ -26,7 +26,8 @@ RUNTIMES_MANIFEST=${1:-"/ansible/files/runtimes.json"}
 
 cd $ROOTDIR/ansible
 
-$ANSIBLE_CMD setup.yml -e mode=HA
+# For the github actions we do not use HA mode to reduce memory and disk requirements.
+$ANSIBLE_CMD setup.yml      # -e mode=HA
 $ANSIBLE_CMD prereq.yml
 $ANSIBLE_CMD couchdb.yml
 $ANSIBLE_CMD initdb.yml