updated jruby version to 9.4.8.0 (#166)

also fix detection of the 8.x branch

Author: jsvd

.buildkite/scripts/resolve_es_treeish.sh

@@ -2,16 +2,20 @@
 
 set -euo pipefail
 
-VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash_releases.json"
-
-echo "Fetching versions from $VERSION_URL"
-VERSIONS=$(curl --retry 5 --retry-delay 5 -fsSL $VERSION_URL)
-
 set +o nounset
-if [[ "$SNAPSHOT" == "true" ]]; then
-  key=$(echo "$VERSIONS" | jq -r '.snapshots."'"$ELASTIC_STACK_VERSION"'"')
+if [[ "$SNAPSHOT" == "true" ]] && [[ "$ELASTIC_STACK_VERSION" == "8.x" ]]; then
+  export ELASTICSEARCH_TREEISH=8.x
 else
-  key=$(echo "$VERSIONS" | jq -r '.releases."'"$ELASTIC_STACK_VERSION"'"')
-fi
+  VERSION_URL="https://raw.githubusercontent.com/elastic/logstash/main/ci/logstash_releases.json"
 
-export ELASTICSEARCH_TREEISH=${key%.*}
+  echo "Fetching versions from $VERSION_URL"
+  VERSIONS=$(curl --retry 5 --retry-delay 5 -fsSL $VERSION_URL)
+
+  if [[ "$SNAPSHOT" == "true" ]]; then
+    key=$(echo "$VERSIONS" | jq -r '.snapshots."'"$ELASTIC_STACK_VERSION"'"')
+  else
+    key=$(echo "$VERSIONS" | jq -r '.releases."'"$ELASTIC_STACK_VERSION"'"')
+  fi
+
+  export ELASTICSEARCH_TREEISH=${key%.*}
+fi

.ci/docker-setup.sh

@@ -11,7 +11,7 @@ pull_docker_snapshot() {
   project="${1?project name required}"
   local docker_image="docker.elastic.co/${project}/${project}:${ELASTIC_STACK_VERSION}"
   echo "Pulling $docker_image"
-  docker pull "$docker_image"
+  docker pull -q "$docker_image"
 }
 
 if [ "$ELASTIC_STACK_VERSION" ]; then

.ruby-version

@@ -1 +1 @@
-jruby-9.4.5.0
+jruby-9.4.8.0