CI: Update the Jenkins configuration

Use the `STACK_VERSION` environment variable defined in the `master` branch.

Author: karmi

.jenkins/jobs/defaults.yml

@@ -46,7 +46,7 @@
     - axis:
         type: yaml
         filename: .jenkins/test-matrix.yml
-        name: ELASTICSEARCH_VERSION
+        name: STACK_VERSION
     - axis:
         type: yaml
         filename: .jenkins/test-matrix.yml

.jenkins/run-tests

@@ -19,12 +19,12 @@ if [[ ($branch_specifier == "refs/heads/xpack" && $TEST_SUITE == "core") ]]; the
 fi
 
 if [[ $TEST_SUITE == "core" ]]; then
-  elasticsearch_image=elasticsearch-oss:$ELASTICSEARCH_VERSION
+  elasticsearch_image=elasticsearch-oss:$STACK_VERSION
   elasticsearch_url=http://es1:9200
 fi
 
 if [[ $TEST_SUITE == "xpack" ]]; then
-  elasticsearch_image=elasticsearch:$ELASTICSEARCH_VERSION
+  elasticsearch_image=elasticsearch:$STACK_VERSION
   elasticsearch_url=https://elastic:elastic@es1:9200
 fi
 
@@ -47,6 +47,7 @@ docker build --file Dockerfile --tag elastic/go-elasticsearch .
 (make cluster detach=true version=$elasticsearch_image)
 
 # Store the Elasticsearch version and build hash
+ELASTICSEARCH_VERSION="$STACK_VERSION"
 ELASTICSEARCH_BUILD_VERSION=$(docker run --network elasticsearch --rm appropriate/curl -sSk $elasticsearch_url | docker run -i --rm stedolan/jq -r '.version.number')
 ELASTICSEARCH_BUILD_HASH=$(docker run --network elasticsearch --rm appropriate/curl -sSk $elasticsearch_url | docker run -i --rm stedolan/jq -r '.version.build_hash')
 
@@ -84,14 +85,14 @@ docker run \
 status=100
 case $TEST_SUITE in
   "core" )
-    if bash .jenkins/tests-core.sh; then
+    if ELASTICSEARCH_VERSION="$ELASTICSEARCH_VERSION" bash .jenkins/tests-core.sh; then
       status=$?
     else
       status=$?
     fi
     ;;
   "xpack" )
-    if bash .jenkins/tests-xpack.sh; then
+    if ELASTICSEARCH_VERSION="$ELASTICSEARCH_VERSION" bash .jenkins/tests-xpack.sh; then
       status=$?
     else
       status=$?

.jenkins/test-matrix.yml

@@ -1,6 +1,6 @@
 ---
 
-ELASTICSEARCH_VERSION:
+STACK_VERSION:
   - 7.x-SNAPSHOT
 
 GO_VERSION: