[CI] Refactors Serverless and Stack into one script

Author: picandocodigo

.buildkite/functions/wait-for-container.sh

@@ -14,7 +14,7 @@ function wait_for_container {
     echo ""
     docker inspect -f "{{range .State.Health.Log}}{{.Output}}{{end}}" ${1}
     echo -e "\033[34;1mINFO:\033[0m waiting for node $1 to be up\033[0m"
-    sleep 5;
+    sleep 10;
   done;
 
   # Always show logs if the container is running, this is very useful both on CI as well as while developing

.buildkite/pipeline.yml

@@ -51,29 +51,19 @@ steps:
       - touch ~/.elastic/cloud.json
       - echo "{\"api_key\":{\"qa\":\"$(vault read -field=qa secret/ci/elastic-elasticsearch-ruby/cloud-access)\"}}" > ~/.elastic/cloud.json
       - ./.buildkite/create-serverless.sh
-  - label: "Run :elasticsearch: Serverless :rspec: Tests :ruby: {{ matrix.ruby_source }} {{ matrix.ruby }}"
+  - label: "Run :elasticsearch: Serverless :rspec: Tests :ruby:"
     key: run-serverless-tests
     depends_on:
       - step: create-serverless
     agents:
       provider: "gcp"
     env:
-      RUBY_VERSION: "{{ matrix.ruby }}"
-      RUBY_SOURCE: "{{ matrix.ruby_source }}"
+      RUBY_VERSION: "3.4"
+      RUBY_SOURCE: "ruby"
       TEST_SUITE: serverless
       ES_YAML_TESTS_BRANCH: main
       QUIET: false
-    matrix:
-      setup:
-        ruby:
-          - '3.4'
-        ruby_source:
-          - 'ruby'
-      adjustments:
-        - with:
-            ruby_source: 'jruby'
-            ruby: '9.4'
-    command: ./.buildkite/run-serverless-tests.sh
+    command: ./.buildkite/run-yaml-tests.sh
     artifact_paths: "elasticsearch-api/tmp/*"
   - label: "Destroy :elasticsearch: Serverless projects"
     depends_on:

.buildkite/run-yaml-tests.sh

@@ -5,16 +5,26 @@
 # Version 0.1
 #
 script_path=$(dirname $(realpath -s $0))
-source $script_path/functions/imports.sh
+
+if [[ "$TEST_SUITE" == "serverless" ]]; then
+  # Get Elasticsearch Serverless credentials and endpoint
+  TEST_ES_SERVER=`buildkite-agent meta-data get "ELASTICSEARCH_URL"`
+  ES_API_SECRET_KEY=`buildkite-agent meta-data get "ES_API_SECRET_KEY"`
+else
+  # Start Elasticsearch Stack on Docker
+  source $script_path/functions/imports.sh
+  echo "--- :elasticsearch: Starting Elasticsearch"
+  DETACH=true bash $script_path/run-elasticsearch.sh
+fi
+
 set -euo pipefail
 repo=`pwd`
 
-echo "--- :elasticsearch: Starting Elasticsearch"
-DETACH=true bash $script_path/run-elasticsearch.sh
-
 export RUBY_VERSION=${RUBY_VERSION:-3.1}
 export BUILDKITE=${BUILDKITE:-false}
 export TRANSPORT_VERSION=${TRANSPORT_VERSION:-8}
+export QUIET=${QUIET:-false}
+export DEBUG=${DEBUG:-false}
 
 echo "--- :ruby: Building Docker image"
 docker build \
@@ -27,20 +37,40 @@ docker build \
 
 mkdir -p elasticsearch-api/tmp
 
-echo "--- :ruby: Running :yaml: tests"
+environment=($(cat <<-END
+  --env "BUILDKITE=${BUILDKITE}"
+  --env "TRANSPORT_VERSION=${TRANSPORT_VERSION}"
+  --env "ES_YAML_TESTS_BRANCH=${ES_YAML_TESTS_BRANCH}"
+  --env "DEBUG=${DEBUG}"
+  --env "QUIET=${QUIET}"
+END
+))
+
+if [[ "$TEST_SUITE" == "serverless" ]]; then
+  echo "--- :ruby: Running :yaml: tests"
+  environment+=($(cat <<-END
+    --env "TEST_ES_SERVER=${TEST_ES_SERVER}"
+    --env "ES_API_KEY=${ES_API_SECRET_KEY}"
+END
+))
+else
+  echo "--- :ruby: Running $TEST_SUITE tests"
+  environment+=($(cat <<-END
+  --network="${network_name}"
+  --env "TEST_ES_SERVER=${elasticsearch_url}"
+  --env "ELASTIC_PASSWORD=${elastic_password}"
+  --env "ELASTIC_USER=elastic"
+  --env "TEST_ES_SERVER=${elasticsearch_url}"
+  --env "STACK_VERSION=${STACK_VERSION}"
+END
+))
+fi
+
 docker run \
-       -u "$(id -u)" \
-       --network="${network_name}" \
-       --env "TEST_ES_SERVER=${elasticsearch_url}" \
-       --env "ELASTIC_PASSWORD=${elastic_password}" \
-       --env "ELASTIC_USER=elastic" \
-       --env "BUILDKITE=${BUILDKITE}" \
-       --env "TRANSPORT_VERSION=${TRANSPORT_VERSION}" \
-       --env "STACK_VERSION=${STACK_VERSION}" \
-       --env "ES_YAML_TESTS_BRANCH=${ES_YAML_TESTS_BRANCH}" \
-       --env "DEBUG=${DEBUG}" \
-       --volume $repo:/usr/src/app \
-       --name elasticsearch-ruby \
-       --rm \
-       elastic/elasticsearch-ruby \
-       bundle exec rake test:yaml
+         -u "$(id -u)" \
+         "${environment[@]}" \
+         --volume $repo:/usr/src/app \
+         --name elasticsearch-ruby \
+         --rm \
+         elastic/elasticsearch-ruby \
+         bundle exec rake test:yaml

elasticsearch-api/spec/yaml-test-runner/run.rb

@@ -21,6 +21,8 @@
 require 'elasticsearch/tests/test_runner'
 require 'elasticsearch/tests/downloader'
 
+puts "Env vars: #{ENV['TEST_SUITE']} #{ENV['TEST_ES_SERVER']}"
+
 PROJECT_PATH = File.join(File.dirname(__FILE__), '../..')
 CERTS_PATH = "#{PROJECT_PATH}/../.buildkite/certs/".freeze
 host = ENV['TEST_ES_SERVER'] || 'https://localhost:9200'
@@ -35,7 +37,7 @@
   raw_key = File.read("#{CERTS_PATH}/testnode.key")
   key = OpenSSL::PKey::RSA.new(raw_key)
   ca_file = File.expand_path("#{CERTS_PATH}/ca.crt")
-  host = "https://elastic:#{password}@#{uri.host}:#{uri.port}".freeze
+  host = "https://elastic:#{password}@#{uri.host}:#{uri.port}".freeze unless ENV['TEST_SUITE'] == 'serverless'
   transport_options = {
     ssl: {
       client_cert: certificate,