From 3c41670c861076c26454f9804da54b16110b901e Mon Sep 17 00:00:00 2001 From: Matt Rutkowski Date: Mon, 8 Feb 2021 16:03:53 -0600 Subject: [PATCH 1/4] Update int. test to explicitely request go:1.15 runtime --- tests/src/integration/helloworld/manifest.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/src/integration/helloworld/manifest.yaml b/tests/src/integration/helloworld/manifest.yaml index 3a654180d..4451de1a7 100644 --- a/tests/src/integration/helloworld/manifest.yaml +++ b/tests/src/integration/helloworld/manifest.yaml @@ -178,7 +178,7 @@ packages: msg["greeting"] = "Hello, " + name + "!" return msg } - runtime: go:1.11 + runtime: go:1.15 sequences: # sequence of helloworld in all four runtimes hello-world-series: From 3c596725ba8ec5e98663a7070b979de46434cc89 Mon Sep 17 00:00:00 2001 From: Matt Rutkowski Date: Tue, 9 Feb 2021 15:12:23 -0600 Subject: [PATCH 2/4] Add elasticsearch.yml to ansible setup confs. --- tools/travis/script.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/travis/script.sh b/tools/travis/script.sh index af2c35334..b7a47c97d 100755 --- a/tools/travis/script.sh +++ b/tools/travis/script.sh @@ -52,6 +52,7 @@ $ANSIBLE_CMD prereq.yml $ANSIBLE_CMD couchdb.yml $ANSIBLE_CMD initdb.yml $ANSIBLE_CMD wipe.yml +$ANSIBLE_CMD elasticsearch.yml $ANSIBLE_CMD openwhisk.yml -e '{"openwhisk_cli":{"installation_mode":"remote","remote":{"name":"OpenWhisk_CLI","dest_name":"OpenWhisk_CLI","location":"https://github.com/apache/openwhisk-cli/releases/download/latest"}}}' $ANSIBLE_CMD properties.yml $ANSIBLE_CMD apigateway.yml From 53cbe408a6b934292affc320e8d32755163f13f5 Mon Sep 17 00:00:00 2001 From: Matt Rutkowski Date: Tue, 9 Feb 2021 15:47:18 -0600 Subject: [PATCH 3/4] Add elasticsearch.yml to ansible setup confs. --- tools/travis/script.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/travis/script.sh b/tools/travis/script.sh index b7a47c97d..1210efdfc 100755 --- a/tools/travis/script.sh +++ b/tools/travis/script.sh @@ -53,7 +53,7 @@ $ANSIBLE_CMD couchdb.yml $ANSIBLE_CMD initdb.yml $ANSIBLE_CMD wipe.yml $ANSIBLE_CMD elasticsearch.yml -$ANSIBLE_CMD openwhisk.yml -e '{"openwhisk_cli":{"installation_mode":"remote","remote":{"name":"OpenWhisk_CLI","dest_name":"OpenWhisk_CLI","location":"https://github.com/apache/openwhisk-cli/releases/download/latest"}}}' +$ANSIBLE_CMD openwhisk.yml -e '{"openwhisk_cli":{"installation_mode":"remote","remote":{"name":"OpenWhisk_CLI","dest_name":"OpenWhisk_CLI","location":"https://github.com/apache/openwhisk-cli/releases/download/latest"}}}' -e db_activation_backend=ElasticSearch $ANSIBLE_CMD properties.yml $ANSIBLE_CMD apigateway.yml $ANSIBLE_CMD routemgmt.yml From cc31d518cf418bdef2babc5d36cab93f005e9f94 Mon Sep 17 00:00:00 2001 From: Matt Rutkowski Date: Tue, 9 Feb 2021 16:42:51 -0600 Subject: [PATCH 4/4] Add elasticsearch.yml to ansible setup confs. --- ansible/environments/local/hosts | 3 +++ tools/travis/script.sh | 3 +-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/ansible/environments/local/hosts b/ansible/environments/local/hosts index 7b0fe4d9d..05297b3b8 100644 --- a/ansible/environments/local/hosts +++ b/ansible/environments/local/hosts @@ -37,6 +37,9 @@ invoker0 ansible_host=172.17.0.1 ansible_connection=local [db] 172.17.0.1 ansible_host=172.17.0.1 ansible_connection=local +[elasticsearch:children] +db + [redis] 172.17.0.1 ansible_host=172.17.0.1 ansible_connection=local diff --git a/tools/travis/script.sh b/tools/travis/script.sh index 1210efdfc..af2c35334 100755 --- a/tools/travis/script.sh +++ b/tools/travis/script.sh @@ -52,8 +52,7 @@ $ANSIBLE_CMD prereq.yml $ANSIBLE_CMD couchdb.yml $ANSIBLE_CMD initdb.yml $ANSIBLE_CMD wipe.yml -$ANSIBLE_CMD elasticsearch.yml -$ANSIBLE_CMD openwhisk.yml -e '{"openwhisk_cli":{"installation_mode":"remote","remote":{"name":"OpenWhisk_CLI","dest_name":"OpenWhisk_CLI","location":"https://github.com/apache/openwhisk-cli/releases/download/latest"}}}' -e db_activation_backend=ElasticSearch +$ANSIBLE_CMD openwhisk.yml -e '{"openwhisk_cli":{"installation_mode":"remote","remote":{"name":"OpenWhisk_CLI","dest_name":"OpenWhisk_CLI","location":"https://github.com/apache/openwhisk-cli/releases/download/latest"}}}' $ANSIBLE_CMD properties.yml $ANSIBLE_CMD apigateway.yml $ANSIBLE_CMD routemgmt.yml