Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ci: bump elastic stack version #1038

Merged
merged 4 commits into from
Jun 15, 2021

Conversation

v1v
Copy link
Member

@v1v v1v commented Jun 14, 2021

What

  • Bump version 7.10.0 to 7.13.1
  • Script to bump release versions automatically

Actions

  • Add this repo to the bump release automation

Issues

There is no a tracked issue for this particular PR. I identified this particular need when raising a couple of issues regarding build failures in the CI.

Test

$ git checkout master
$ .ci/bump-stack-release-version.sh 7.13.1 7.13.2

produces

diff --git a/.ci/scripts/load-testing.sh b/.ci/scripts/load-testing.sh
index f77462d..4a09667 100755
--- a/.ci/scripts/load-testing.sh
+++ b/.ci/scripts/load-testing.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-STACK_VERSION=${1:-7.10.0}
+STACK_VERSION=${1:-7.13.1}
 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 bd49254..b070202 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:-7.10.0}
+export STACK_VERSION=${STACK_VERSION:-7.13.1}
 
 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 f629f1b..25f1c9a 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:-7.10.0}
+STACK_VERSION=${STACK_VERSION:-7.13.1}
 
 pip install docker-compose>=1.25.4
 
diff --git a/Jenkinsfile b/Jenkinsfile
index 17ecb9f..2ed3113 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -41,7 +41,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 master.')
-    string(name: 'stack_version', defaultValue: '7.10.0', description: "What's the Stack Version to be used for the load testing?")
+    string(name: 'stack_version', defaultValue: '7.13.1', description: "What's the Stack Version to be used for the load testing?")
   }
   stages {
     stage('Initializing'){
@@ -112,11 +112,7 @@ pipeline {
             axes {
                 axis {
                   name 'STACK_VERSION'
-                  values (
-                    '8.0.0-SNAPSHOT',
-                    '7.7.0',
-                    '7.0.0'
-                  )
+                  values '8.0.0-SNAPSHOT', '7.x', '7.13.2'
                 }
                 axis {
                   name 'SCOPE'
diff --git a/dev-utils/docker-compose.yml b/dev-utils/docker-compose.yml
index 54b3b9b..36ffc7b 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:-7.10.0}
+    image: docker.elastic.co/elasticsearch/elasticsearch:${STACK_VERSION:-7.13.1}
     environment:
       - cluster.name=docker-cluster
       - bootstrap.memory_lock=true
@@ -34,7 +34,7 @@ services:
 
   apm-server:
     container_name: apm-server
-    image: docker.elastic.co/apm/apm-server:${STACK_VERSION:-7.10.0}
+    image: docker.elastic.co/apm/apm-server:${STACK_VERSION:-7.13.1}
     ports:
       - "127.0.0.1:${APM_SERVER_PORT:-8200}:8200"
     environment:
@@ -84,7 +84,7 @@ services:
 
   kibana:
     container_name: kibana
-    image: docker.elastic.co/kibana/kibana:${STACK_VERSION:-7.10.0}
+    image: docker.elastic.co/kibana/kibana:${STACK_VERSION:-7.13.1}
     environment:
       SERVER_NAME: kibana.example.org
       ELASTICSEARCH_URL: http://elasticsearch:9200

@apmmachine
Copy link
Contributor

📦 Bundlesize report

Filename Size(bundled) Size(gzip) Diff(gzip)
elastic-apm-opentracing.umd.min.js 63.5 KiB 20.3 KiB 💚 0 Bytes
elastic-apm-rum.umd.min.js 57.6 KiB 18.8 KiB 💚 0 Bytes

@apmmachine
Copy link
Contributor

apmmachine commented Jun 14, 2021

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS
Pipeline View Test View Changes Artifacts preview

Expand to view the summary

Build stats

  • Build Cause: Pull request #1038 updated

  • Start Time: 2021-06-15T15:47:14.607+0000

  • Duration: 69 min 26 sec

  • Commit: 99073ca

Test stats 🧪

Test Results
Failed 0
Passed 1062
Skipped 9
Total 1071

Trends 🧪

Image of Build Times

Image of Tests

@v1v
Copy link
Member Author

v1v commented Jun 15, 2021

/test

@v1v v1v marked this pull request as ready for review June 15, 2021 08:08
@v1v v1v requested review from a team June 15, 2021 08:09
@v1v v1v self-assigned this Jun 15, 2021
@v1v v1v added Team:Automation Label for the Observability productivity team automation ci labels Jun 15, 2021
@cachedout
Copy link
Contributor

If this is related to an open issue, could you please link it to the issue number? If it's not, please just note that in the PR. Thanks! :)

@v1v
Copy link
Member Author

v1v commented Jun 15, 2021

If this is related to an open issue, could you please link it to the issue number? If it's not, please just note that in the PR. Thanks! :)

Done, in the description since there was no a tracked issue

Copy link
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The scope args passing is incorrect which causes the saucelabs tests to fail.

SCOPE=SCOPE=@elastic/apm-rum-core

Might be from here -

def scopes = [
'SCOPE=@elastic/apm-rum-core',
'SCOPE=@elastic/apm-rum',
'SCOPE=@elastic/apm-rum-react',
'SCOPE=@elastic/apm-rum-angular',
'SCOPE=@elastic/apm-rum-vue'
]
?

Copy link
Member

@vigneshshanmugam vigneshshanmugam left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM 🚀

@vigneshshanmugam vigneshshanmugam merged commit fa9cd92 into elastic:master Jun 15, 2021
@v1v v1v deleted the feature/bump-elastic-version branch June 16, 2021 08:58
David-Development pushed a commit to David-Development/apm-agent-rum-js that referenced this pull request Oct 20, 2021
* ci: bump elastic stack version

* chore: fix typo in the script

* chore: set commit message

* ci: remove scope prefix
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation ci Team:Automation Label for the Observability productivity team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants