Skip to content

Commit

Permalink
Add nodejs:20, go:1.19 and go:1.21 to apiv1swagger and tests. (#164)
Browse files Browse the repository at this point in the history
- 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.
  • Loading branch information
falkzoll authored Sep 21, 2023
1 parent 9b76864 commit 7c9ec1b
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 5 deletions.
5 changes: 3 additions & 2 deletions .github/workflows/run-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 3 additions & 0 deletions core/controller/src/main/resources/apiv1swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -1895,6 +1895,7 @@
"nodejs:10",
"nodejs:12",
"nodejs:16",
"nodejs:20",
"nodejs:default",
"php:7.3",
"php:7.4",
Expand All @@ -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",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion tests/src/test/scala/system/rest/JsonSchemaTests.scala
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
3 changes: 2 additions & 1 deletion tools/travis/setupPrereq.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 7c9ec1b

Please sign in to comment.