fix(tests): bumping elastic search to version 7.17.29 to allow proper test execution also on apple silicon based machine

Author: francescotimperioss

ansible/group_vars/all

@@ -352,7 +352,7 @@ couchdb:
   version: 2.3
 
 elasticsearch:
-  version: 6.7.2
+  version: 7.17.29
 
 elasticsearch_connect_string: "{% set ret = [] %}\
                                {% for host in groups['elasticsearch'] %}\

ansible/roles/elasticsearch/templates/elasticsearch.yml.j2

@@ -1,23 +1,63 @@
+# Elastic Search 6.7.2 setup (kept for reference)
+#cluster.name: "{{ db.elasticsearch.cluster_name }}"
+#node.name: "{{ elasticsearch_name }}"
+#network.host: 0.0.0.0
+#network.publish_host: {{ ansible_default_ipv4.address | default(ansible_host | default('127.0.0.1')) }}
+
+#http.port: 9200
+#transport.tcp.port: {{ transport_port }}
+
+# minimum_master_nodes need to be explicitly set when bound on a public IP
+# set to 1 to allow single node clusters
+# Details: https://github.com/elastic/elasticsearch/pull/17282
+#discovery.zen.ping.unicast.hosts:
+#{% for es in groups['elasticsearch'] %}
+#   - {{ hostvars[es].ansible_host }}:{{ db.elasticsearch.base_transport_port|int + host_group.index(es)|int }}
+#{% endfor %}
+#discovery.zen.minimum_master_nodes: {{ (host_group|length / 2 + 1) | int}}
+
+#gateway.recover_after_nodes: {{ (host_group|length / 2 + 1) | int }}
+#gateway.expected_nodes: {{ host_group|length }}
+#gateway.recover_after_time: 5m
+
+#xpack.security.enabled: false
+#bootstrap.memory_lock: true
+
+# Elastic Search 7.17.29 setup
+
 cluster.name: "{{ db.elasticsearch.cluster_name }}"
 node.name: "{{ elasticsearch_name }}"
+
 network.host: 0.0.0.0
 network.publish_host: {{ ansible_default_ipv4.address | default(ansible_host | default('127.0.0.1')) }}
 
 http.port: 9200
-transport.tcp.port: {{ transport_port }}
 
-# minimum_master_nodes need to be explicitly set when bound on a public IP
-# set to 1 to allow single node clusters
-# Details: https://github.com/elastic/elasticsearch/pull/17282
-discovery.zen.ping.unicast.hosts:
+# Elasticsearch 7.x transport port
+transport.port: {{ transport_port }}
+
+{% if host_group|length == 1 %}
+
+# Single node deployment (local OpenWhisk tests)
+discovery.type: single-node
+
+{% else %}
+
+# Multi-node Elasticsearch 7.x cluster
+discovery.seed_hosts:
 {% for es in groups['elasticsearch'] %}
    - {{ hostvars[es].ansible_host }}:{{ db.elasticsearch.base_transport_port|int + host_group.index(es)|int }}
 {% endfor %}
-discovery.zen.minimum_master_nodes: {{ (host_group|length / 2 + 1) | int}}
 
-gateway.recover_after_nodes: {{ (host_group|length / 2 + 1) | int }}
-gateway.expected_nodes: {{ host_group|length }}
-gateway.recover_after_time: 5m
+cluster.initial_master_nodes:
+{% for es in groups['elasticsearch'] %}
+   - {{ hostvars[es].ansible_host }}
+{% endfor %}
 
+{% endif %}
+
+# Disable security for OpenWhisk
 xpack.security.enabled: false
-bootstrap.memory_lock: true
+
+# Allow memory locking
+bootstrap.memory_lock: true

tools/macos/README.md

@@ -102,9 +102,12 @@ Bellow are the ansible commands required to prepare your machine:
 cd ./ansible
 
 ansible-playbook setup.yml -e mode=HA
+ansible-playbook prereq.yml
 ansible-playbook couchdb.yml
 ansible-playbook initdb.yml
 ansible-playbook wipe.yml
+ansible-playbook elasticsearch.yml
+ansible-playbook etcd.yml
 ansible-playbook downloadcli-github.yml
 
 ansible-playbook properties.yml
@@ -114,5 +117,8 @@ To run the unit tests execute the command bellow from the project's root folder:
 ```bash
 # go back to project's root folder
 cd ../
+
+export TESTCONTAINERS_RYUK_DISABLED="true"
+
 ./gradlew -PtestSetName="REQUIRE_ONLY_DB" :tests:testCoverageLean
 ```