From 4fd5bf52052ba7623198c9cd5e8a9f042ff4c237 Mon Sep 17 00:00:00 2001
From: apmmachine <58790750+apmmachine@users.noreply.github.com>
Date: Thu, 3 Nov 2022 15:45:12 -0400
Subject: [PATCH] chore: update elastic stack release 8.5.0 and 8.5.0 (#1299)

Co-authored-by: apmmachine <infra-root-apmmachine@elastic.co>
---
 .ci/scripts/load-testing.sh   | 2 +-
 .ci/scripts/pull_and_build.sh | 2 +-
 .ci/scripts/test.sh           | 2 +-
 Jenkinsfile                   | 4 ++--
 dev-utils/docker-compose.yml  | 6 +++---
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.ci/scripts/load-testing.sh b/.ci/scripts/load-testing.sh
index 8cf57e155..137d5a64a 100755
--- a/.ci/scripts/load-testing.sh
+++ b/.ci/scripts/load-testing.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-STACK_VERSION=${1:-8.4.2}
+STACK_VERSION=${1:-8.5.0}
 USER_ID="$(id -u):$(id -g)"
 NODEJS_VERSION=$(cat ./dev-utils/.node-version)
 
diff --git a/.ci/scripts/pull_and_build.sh b/.ci/scripts/pull_and_build.sh
index d7ac17ca6..ea6978c10 100755
--- a/.ci/scripts/pull_and_build.sh
+++ b/.ci/scripts/pull_and_build.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 export NODEJS_VERSION=$(cat ./dev-utils/.node-version)
-export STACK_VERSION=${STACK_VERSION:-8.4.2}
+export STACK_VERSION=${STACK_VERSION:-8.5.0}
 
 STACK_VERSION=${STACK_VERSION} \
 docker-compose -f ./dev-utils/docker-compose.yml --log-level INFO pull --quiet --ignore-pull-failures
diff --git a/.ci/scripts/test.sh b/.ci/scripts/test.sh
index eac475b6f..c2a014447 100755
--- a/.ci/scripts/test.sh
+++ b/.ci/scripts/test.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -xeo pipefail
-STACK_VERSION=${STACK_VERSION:-8.4.2}
+STACK_VERSION=${STACK_VERSION:-8.5.0}
 
 pip install docker-compose>=1.25.4
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 434dffcf2..dc157bc01 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,7 +38,7 @@ pipeline {
     booleanParam(name: 'saucelab_test', defaultValue: "true", description: "Enable run a Sauce lab test")
     booleanParam(name: 'bench_ci', defaultValue: true, description: 'Enable benchmarks')
     booleanParam(name: 'release', defaultValue: false, description: 'Release. If so, all the other parameters will be ignored when releasing from main.')
-    string(name: 'stack_version', defaultValue: '8.4.2', description: "What's the Stack Version to be used for the load testing?")
+    string(name: 'stack_version', defaultValue: '8.5.0', description: "What's the Stack Version to be used for the load testing?")
   }
   stages {
     stage('Initializing'){
@@ -122,7 +122,7 @@ pipeline {
                 // The below line is part of the bump release automation
                 // if you change anything please modifies the file
                 // .ci/bump-stack-release-version.sh
-                values '8.0.0-SNAPSHOT', '8.4.2'
+                values '8.0.0-SNAPSHOT', '8.5.0'
               }
               axis {
                 name 'SCOPE'
diff --git a/dev-utils/docker-compose.yml b/dev-utils/docker-compose.yml
index 84ea83bc0..537c4e76c 100644
--- a/dev-utils/docker-compose.yml
+++ b/dev-utils/docker-compose.yml
@@ -2,7 +2,7 @@ version: "2.1"
 services:
   elasticsearch:
     container_name: elasticsearch
-    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION:-8.4.2}
+    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION:-8.5.0}
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -48,7 +48,7 @@ services:
 
   fleet-server:
     container_name: apm-server
-    image: docker.elastic.co/beats/elastic-agent:${STACK_VERSION:-8.4.2}
+    image: docker.elastic.co/beats/elastic-agent:${STACK_VERSION:-8.5.0}
     entrypoint: "/bin/bash"
     command:
         - "-l"
@@ -83,7 +83,7 @@ services:
 
   kibana:
     container_name: kibana
-    image: docker.elastic.co/kibana/kibana:${STACK_VERSION:-8.4.2}
+    image: docker.elastic.co/kibana/kibana:${STACK_VERSION:-8.5.0}
     environment:
         ELASTICSEARCH_HOSTS: http://elasticsearch:9200
         ELASTICSEARCH_USERNAME: "${KIBANA_ES_USER:-kibana_system_user}"