Skip to content

Commit

Permalink
chore: update elastic stack release 8.5.0 and 8.5.0 (#1299)
Browse files Browse the repository at this point in the history
Co-authored-by: apmmachine <[email protected]>
  • Loading branch information
apmmachine and apmmachine authored Nov 3, 2022
1 parent ecde399 commit 4fd5bf5
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion .ci/scripts/load-testing.sh
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/pull_and_build.sh
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion .ci/scripts/test.sh
Original file line number Diff line number Diff line change
@@ -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

Expand Down
4 changes: 2 additions & 2 deletions Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -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'){
Expand Down Expand Up @@ -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'
Expand Down
6 changes: 3 additions & 3 deletions dev-utils/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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}"
Expand Down

0 comments on commit 4fd5bf5

Please sign in to comment.