[CI] Updates for running 8.0.0

Author: picandocodigo

.ci/functions/imports.sh

@@ -26,10 +26,20 @@ if [[ -z $es_node_name ]]; then
   export es_node_name=instance
   export elastic_password=changeme
   export elasticsearch_image=elasticsearch
-  export elasticsearch_url=https://elastic:${elastic_password}@${es_node_name}:9200
-  if [[ $TEST_SUITE != "platinum" ]]; then
-    export elasticsearch_url=http://${es_node_name}:9200
+
+  if [[ $STACK_VERSION == "8.0.0-SNAPSHOT" ]]; then
+    export elasticsearch_scheme="https"
+    if [[ $TEST_SUITE != "platinum" ]]; then
+      export elasticsearch_scheme="http"
+    fi
+    export elasticsearch_url=${elasticsearch_scheme}://elastic:${elastic_password}@${es_node_name}:9200
+  else
+    export elasticsearch_url=https://elastic:${elastic_password}@${es_node_name}:9200
+    if [[ $TEST_SUITE != "platinum" ]]; then
+        export elasticsearch_url=http://${es_node_name}:9200
+    fi
   fi
+
   export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}
   export elasticsearch_container="${elasticsearch_image}:${STACK_VERSION}"
 

.ci/run-elasticsearch.sh

@@ -44,6 +44,15 @@ environment=($(cat <<-END
   --env cluster.deprecation_indexing.enabled=false
 END
 ))
+
+if [[ $STACK_VERSION == "8.0.0-SNAPSHOT" ]]; then
+    environment+=($(cat <<-EOF
+    --env ELASTIC_PASSWORD=$elastic_password
+    --env xpack.security.enabled=true
+EOF
+))
+fi
+
 if [[ "$TEST_SUITE" == "platinum" ]]; then
   environment+=($(cat <<-END
     --env ELASTIC_PASSWORD=$elastic_password

.ci/run-repository.sh

@@ -39,7 +39,14 @@ echo -e "\033[1m>>>>> Run [elastic/elasticsearch-ruby container] >>>>>>>>>>>>>>>
 repo=`pwd`
 
 if [[ $STACK_VERSION == "8.0.0-SNAPSHOT" ]]; then
-  ELASTIC_API_VERSIONING=true
+    environment=($(cat <<-EOF
+    --env ELASTIC_API_VERSIONING=true
+    --env ELASTIC_PASSWORD=${elastic_password}
+    --env ELASTIC_USER=elastic
+    --env STACK_VERSION=${STACK_VERSION}
+EOF
+))
+
 fi
 
 # run the client tests
@@ -48,6 +55,7 @@ if [[ $TEST_SUITE != "platinum" ]]; then
            --network="${network_name}" \
            --env "TEST_ES_SERVER=${elasticsearch_url}" \
            --env "TEST_SUITE=${TEST_SUITE}" \
+           "${environment[@]}" \
            --volume $repo:/usr/src/app \
            --volume=/tmp:/tmp \
            --name elasticsearch-ruby \

Rakefile

@@ -39,6 +39,10 @@ def admin_client
                         password = ENV['ELASTIC_PASSWORD']
                         user     = ENV['ELASTIC_USER'] || 'elastic'
                         url      = "https://#{user}:#{password}@#{uri.host}:#{uri.port}"
+                      elsif ENV['STACK_VERSION'] == '8.0.0-SNAPSHOT'
+                        password = ENV['ELASTIC_PASSWORD']
+                        user     = ENV['ELASTIC_USER'] || 'elastic'
+                        url      = "http://#{user}:#{password}@#{uri.host}:#{uri.port}"
                       else
                         url = "http://#{uri&.host || 'localhost'}:#{uri&.port || 9200}"
                       end