[CI] Adds STACK_VERSION to log results

Author: picandocodigo

.buildkite/log-results.sh

@@ -7,9 +7,10 @@ buildkite-agent artifact download "elasticsearch-api/tmp/*.html" .
 files="elasticsearch-api/tmp/*.html"
 for f in $files; do
   TEST_SUITE=`echo $f | grep -o "\(free\|platinum\)"`
-  RUBY_VERSION=`echo $f | grep -Po "(\d+\.)+\d+"`
+  RUBY_VERSION=`echo $f | grep -Po "(\d+\.)+\d+" | head -1`
+  STACK_VERSION=`echo $f | grep -Po "([0-9.]+(-SNAPSHOT))"`
   EXAMPLES=`cat $f | grep -o "[0-9]\+ examples" | tail -1`
   FAILURES=`cat $f | grep -o "[0-9]\+ failures" | tail -1`
   PENDING=`cat $f | grep -o "[0-9]\+ pending" | tail -1`
-  echo "--- :ruby: $RUBY_VERSION :test_tube: $TEST_SUITE :rspec: $EXAMPLES - :x: $FAILURES - :pinched_fingers: $PENDING"
+  echo "--- :elasticsearch: $STACK_VERSION :ruby: $RUBY_VERSION :test_tube: $TEST_SUITE :rspec: $EXAMPLES - :x: $FAILURES - :pinched_fingers: $PENDING"
 done

elasticsearch-api/spec/spec_helper.rb

@@ -74,7 +74,7 @@ def self.included(context)
   config.add_formatter('RspecJunitFormatter', 'tmp/elasticsearch-api-junit.xml')
   config.add_formatter(
     'RSpec::Core::Formatters::HtmlFormatter',
-    "tmp/elasticsearch-#{ENV['TEST_SUITE']}-#{RUBY_VERSION}.html"
+    "tmp/elasticsearch-#{ENV['TEST_SUITE']}-#{RUBY_VERSION}-#{ENV['STACK_VERSION']}.html"
   )
   config.color_mode = :on
 end

elasticsearch-xpack/spec/spec_helper.rb

@@ -53,6 +53,6 @@ def self.included(context)
   config.add_formatter('RspecJunitFormatter', '../elasticsearch-api/tmp/elasticsearch-xpack-junit.xml')
   config.add_formatter(
     'RSpec::Core::Formatters::HtmlFormatter',
-    "tmp/elasticsearch-#{ENV['TEST_SUITE']}-#{RUBY_VERSION}.html"
+    "../elasticsearch-api/tmp/elasticsearch-#{ENV['TEST_SUITE']}-#{RUBY_VERSION}-#{ENV['STACK_VERSION']}.html"
   )
 end