From 2494f08ad2cbe98de681da9b9ad12416155a2851 Mon Sep 17 00:00:00 2001
From: delvedor <tommydelved@gmail.com>
Date: Mon, 8 Feb 2021 17:44:28 +0100
Subject: [PATCH] Updated CI conf

---
 .ci/functions/imports.sh | 5 ++---
 .ci/run-elasticsearch.sh | 6 +++---
 .ci/test-matrix.yml      | 4 ++--
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.ci/functions/imports.sh b/.ci/functions/imports.sh
index e022a3be9..3fb28cc38 100644
--- a/.ci/functions/imports.sh
+++ b/.ci/functions/imports.sh
@@ -18,7 +18,7 @@ require_stack_version
 if [[ -z $es_node_name ]]; then
   # only set these once
   set -euo pipefail
-  export TEST_SUITE=${TEST_SUITE-oss}
+  export TEST_SUITE=${TEST_SUITE-free}
   export RUNSCRIPTS=${RUNSCRIPTS-}
   export DETACH=${DETACH-false}
   export CLEANUP=${CLEANUP-false}
@@ -27,8 +27,7 @@ if [[ -z $es_node_name ]]; then
   export elastic_password=changeme
   export elasticsearch_image=elasticsearch
   export elasticsearch_url=https://elastic:${elastic_password}@${es_node_name}:9200
-  if [[ $TEST_SUITE != "xpack" ]]; then
-    export elasticsearch_image=elasticsearch-${TEST_SUITE}
+  if [[ $TEST_SUITE != "platinum" ]]; then
     export elasticsearch_url=http://${es_node_name}:9200
   fi
   export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}
diff --git a/.ci/run-elasticsearch.sh b/.ci/run-elasticsearch.sh
index 91a11027a..ff7cb14fe 100755
--- a/.ci/run-elasticsearch.sh
+++ b/.ci/run-elasticsearch.sh
@@ -4,7 +4,7 @@
 # to form a cluster suitable for running the REST API tests.
 #
 # Export the STACK_VERSION variable, eg. '8.0.0-SNAPSHOT'.
-# Export the TEST_SUITE variable, eg. 'oss' or 'xpack' defaults to 'oss'.
+# Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
 # Version 1.2.0
@@ -39,7 +39,7 @@ environment=($(cat <<-END
   --env repositories.url.allowed_urls=http://snapshot.test*
 END
 ))
-if [[ "$TEST_SUITE" == "xpack" ]]; then
+if [[ "$TEST_SUITE" == "platinum" ]]; then
   environment+=($(cat <<-END
     --env ELASTIC_PASSWORD=$elastic_password
     --env xpack.license.self_generated.type=trial
@@ -64,7 +64,7 @@ END
 fi
 
 cert_validation_flags=""
-if [[ "$TEST_SUITE" == "xpack" ]]; then
+if [[ "$TEST_SUITE" == "platinum" ]]; then
   cert_validation_flags="--insecure --cacert /usr/share/elasticsearch/config/certs/ca.crt --resolve ${es_node_name}:443:127.0.0.1"
 fi
 
diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml
index 1c6423ab7..d33e57e4b 100644
--- a/.ci/test-matrix.yml
+++ b/.ci/test-matrix.yml
@@ -9,7 +9,7 @@ NODE_JS_VERSION:
   - 8
 
 TEST_SUITE:
-  - oss
-  - xpack
+  - free
+  - platinum
 
 exclude: ~