Fix local testing on macOS

Author: pquentin

.buildkite/functions/imports.sh

@@ -43,7 +43,7 @@ if [[ -z $es_node_name ]]; then
 
 fi
 
-  export script_path=$(dirname $(realpath -s $0))
+  export script_path=$(dirname $(realpath $0))
   source $script_path/functions/cleanup.sh
   source $script_path/functions/wait-for-container.sh
   trap "cleanup_trap ${network_name}" EXIT

.buildkite/run-elasticsearch.sh

@@ -21,7 +21,7 @@
 # - Moved ELASTIC_PASSWORD and xpack.security.enabled to the base arguments for "Security On by default"
 # - Use https only when TEST_SUITE is "platinum", when "free" use http
 
-script_path=$(dirname $(realpath -s $0))
+script_path=$(dirname $(realpath $0))
 source $script_path/functions/imports.sh
 set -euo pipefail
 

.buildkite/run-repository.sh

@@ -28,8 +28,6 @@ docker build \
        --file .buildkite/Dockerfile \
        --tag elastic/elasticsearch-py \
        --build-arg "PYTHON_VERSION=${PYTHON_VERSION}" \
-       --build-arg "BUILDER_UID=$(id -u)" \
-       --build-arg "BUILDER_GID=$(id -g)" \
        .
 
 echo -e "\033[1m>>>>> Run [elastic/elasticsearch-py container] >>>>>>>>>>>>>>>>>>>>>>>>>>>>>\033[0m"

.buildkite/run-tests

@@ -5,12 +5,12 @@
 # - Add `$RUNSCRIPTS` env var for running Elasticsearch dependent products
 
 # Default environment variables
-export STACK_VERSION="${STACK_VERSION:=8.0.0-SNAPSHOT}"
+export STACK_VERSION="${STACK_VERSION:=8.16.0-SNAPSHOT}"
 export TEST_SUITE="${TEST_SUITE:=platinum}"
-export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
+export PYTHON_VERSION="${PYTHON_VERSION:=3.12}"
 export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=urllib3}"
 
-script_path=$(dirname $(realpath -s $0))
+script_path=$(dirname $(realpath $0))
 source $script_path/functions/imports.sh
 set -euo pipefail
 

test_elasticsearch/utils.py

@@ -22,6 +22,7 @@
 from typing import Optional, Tuple
 
 from elasticsearch import (
+    ApiError,
     AuthorizationException,
     ConnectionError,
     Elasticsearch,
@@ -55,7 +56,7 @@ def es_url() -> str:
     error = None
     for url in urls_to_try:
         if url.startswith("https://"):
-            client = Elasticsearch(url, ca_certs=CA_CERTS, verify_certs=False)
+            client = Elasticsearch(url, ca_certs=CA_CERTS, verify_certs=True)
         else:
             client = Elasticsearch(url)
         try:
@@ -72,7 +73,7 @@ def es_url() -> str:
                 except ConnectionError:
                     time.sleep(0.1)
 
-        except ConnectionError as e:
+        except (ConnectionError, ApiError) as e:
             if error is None:
                 error = str(e)
         else: