Bump elastic stack version automation #25148

v1v · 2021-04-19T16:41:02Z

What does this PR do?

Enable automerge with mergify

And provide script to bump the versions:

$ .ci/bump-stack-version.sh 8.0.0-3beeb19e
Update stack with version 8.0.0-3beeb19e

This PR is one part of the required changes to enable the automation.

Why is it important?

Handle the stack versions on a PR basis to ensure breaking changes are handled correctly.

Tests

I ran this script in my local environment and produced -> v1v#4

curl -s https://artifacts-api.elastic.co/v1/versions/8.0.0-SNAPSHOT/builds/8.0.0-3beeb19e | jq .manifests { "last-update-time": "Mon, 19 Apr 2021 16:38:33 UTC", "seconds-since-last-update": 11 }

elasticmachine · 2021-04-19T18:48:34Z

💚 Build Succeeded

the below badges are clickable and redirect to their specific view in the CI or DOCS

Expand to view the summary

Build stats

Build Cause: Pull request #25148 updated
Start Time: 2021-04-23T13:42:24.512+0000
Duration: 28 min 4 sec
Commit: 7226193

Trends 🧪

❕ Flaky test report

No test was executed to be analysed.

v1v · 2021-04-19T21:10:21Z

/test

jsoriano · 2021-04-20T08:30:19Z

testing/environments/snapshot.yml

@@ -3,7 +3,7 @@
 version: '2.3'
 services:
  elasticsearch:
-    image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0-SNAPSHOT
+    image: docker.elastic.co/elasticsearch/elasticsearch:8.0.0-3beeb19e-SNAPSHOT


andrewkroh · 2021-04-20T22:27:19Z

This is great. On a related note there was a recent ES where it automatically updates the geoip database leading to some unpredictable behavior despite pinning the version. I started an issue at #25159 to discuss.

ruflin · 2021-04-21T12:19:08Z

See my comment in elastic/fleet-server#252. I was thinking if there are options to get best of both worlds.

Have a fix hash as described in this PR
Run master against snapshot without a hash on daily base and notify the team if it fails
Automatically open every X days a PR that updates the dependency

If we don't update it frequently it will be like all other dependencies that we only update it when we really need it.

v1v · 2021-04-21T12:25:09Z

For clarity, I'll amend this PR to do only one thing, which it's the one related with the script to be consumed by the automation we are talking about.

The other changes were just to validate this worked as expected.

This reverts commit da889e4.

v1v · 2021-04-21T16:47:18Z

.ci/bump-stack-version.sh

+
+echo "Commit changes"
+git config user.email
+git checkout -b "update-stack-version-$(date "+%Y%m%d%H%M%S")"


In order to reuse an existing PR then the branch creating should only happen if set.

In other words,

There is a requirement to support:

Reusing an existing PR if there is already an open PR with a previous bump.

Creating a new PR if the above is not true or it's configured to create always independently.

…ng-versions-stack * upstream/master: (28 commits) Add support for parsers in filestream input (elastic#24763) Skip flaky test TestFilestreamTruncate (elastic#25218) backport: Add 7.13 branch (elastic#25189) Update decode_json_fields.asciidoc (elastic#25056) [Elastic Agent] Fix status and inspect command to work inside running container (elastic#25204) Check native environment before starting (elastic#25186) Change event.code and winlog.event_id type (elastic#25176) [Ingest Manager] Proxy processes/elastic-agent to stats (elastic#25193) Update mergify backporting to 7.x and 7.13 (elastic#25196) [Heartbeat]: ensure synthetics version co* [Heartbeat]: ensure synthetics version compatability for suites * address review and fix notice * fix lowercase struct * fix version conflict and rebase * update go.* stuff to master * fix notice.txt * move validate inside sourcempatability for suites (elastic#24777) [Filebeat] Ensure Kibana audit `event.category` and `event.type` are still processed as strings. (elastic#25101) Update replace.asciidoc (elastic#25055) Fix nil panic when overwriting metadata (elastic#24741) [Filebeat] Add Malware Bazaar to Threat Intel Module (elastic#24570) Fix k8s svc selectors mapping (elastic#25169) [Ingest Manager] Make agent retry values for bootstraping configurable (elastic#25163) [Metricbeat] Remove elasticsearc.index.created from the SM code (elastic#25113) [Ingest Manager] Keep http and logging config during enroll (elastic#25132) Refactor kubernetes autodiscover to avoid skipping short-living pods (elastic#24742) [libbeat] New decode xml wineventlog processor (elastic#25115) ...

.ci/bump-stack-version.sh

jsoriano

Thanks!

.gitignore

(cherry picked from commit cc29196) # Conflicts: # .mergify.yml

v1v · 2021-07-19T14:39:37Z

@Mergifyio backport 6.8

(cherry picked from commit cc29196) # Conflicts: # .gitignore # .mergify.yml

mergify · 2021-07-19T14:40:46Z

Command backport 6.8: success

Backports have been created

#26956 Bump elastic stack version automation (backport #25148) has been created for branch 6.8

v1v added 2 commits April 19, 2021 17:37

Script to bump the stack versions

ac44e91

Pin the stack version to 8.0.0-3beeb19e

da889e4

curl -s https://artifacts-api.elastic.co/v1/versions/8.0.0-SNAPSHOT/builds/8.0.0-3beeb19e | jq .manifests { "last-update-time": "Mon, 19 Apr 2021 16:38:33 UTC", "seconds-since-last-update": 11 }

botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Apr 19, 2021

v1v mentioned this pull request Apr 19, 2021

Use pinned versions of the elastic stack in testing scenarios #24972

Closed

Rename script

50284bd

jsoriano reviewed Apr 20, 2021

View reviewed changes

Add git add/commit commands as required by the automation

bc08256

This was referenced Apr 20, 2021

Bump elastic stack version automation elastic/fleet-server#252

Merged

Bump elastic stack version automation elastic/apm-server#5127

Merged

Bump elastic stack version automation and auto-merge with mergify elastic/e2e-testing#1062

Merged

v1v changed the title ~~Pin stack version in the testing environments~~ Bump elastic stack version automation Apr 21, 2021

v1v added 2 commits April 21, 2021 14:31

mergify auto-merge if bump of versions

b98fa20

Revert "Pin the stack version to 8.0.0-3beeb19e"

1113646

This reverts commit da889e4.

v1v commented Apr 21, 2021

View reviewed changes

ruflin requested a review from urso April 22, 2021 11:01

v1v added 2 commits April 22, 2021 12:19

Refactor and enable the create branch parameter

ef9fa23

v1v commented Apr 23, 2021

View reviewed changes

.ci/bump-stack-version.sh Outdated Show resolved Hide resolved

v1v commented Apr 23, 2021

View reviewed changes

.ci/bump-stack-version.sh Outdated Show resolved Hide resolved

v1v commented Apr 23, 2021

View reviewed changes

.ci/bump-stack-version.sh Outdated Show resolved Hide resolved

Apply suggestions from code review

7c18609

v1v commented Apr 23, 2021

View reviewed changes

.ci/bump-stack-version.sh Outdated Show resolved Hide resolved

Update .ci/bump-stack-version.sh

5282c43

v1v marked this pull request as ready for review April 23, 2021 10:33

v1v requested a review from a team as a code owner April 23, 2021 10:33

v1v self-assigned this Apr 23, 2021

v1v added automation backport-v7.12.0 Automated backport with mergify backport-v7.13.0 Automated backport with mergify backport-v7.14.0 Automated backport with mergify Team:Automation Label for the Observability productivity team labels Apr 23, 2021

botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Apr 23, 2021

jsoriano approved these changes Apr 23, 2021

View reviewed changes

.gitignore Outdated Show resolved Hide resolved

Update .gitignore

7226193

mdelapenya approved these changes Apr 23, 2021

View reviewed changes

v1v merged commit cc29196 into elastic:master Apr 23, 2021

v1v deleted the feature/pin-testing-versions-stack branch April 23, 2021 16:09

mergify bot pushed a commit that referenced this pull request Apr 23, 2021

Bump elastic stack version automation (#25148)

58b8815

(cherry picked from commit cc29196) # Conflicts: # .mergify.yml

mergify bot mentioned this pull request Apr 23, 2021

Bump elastic stack version automation (backport #25148) #25282

Merged

mergify bot pushed a commit that referenced this pull request Apr 23, 2021

Bump elastic stack version automation (#25148)

5107d63

(cherry picked from commit cc29196) # Conflicts: # .mergify.yml

mergify bot mentioned this pull request Apr 23, 2021

Bump elastic stack version automation (backport #25148) #25283

Merged

mergify bot pushed a commit that referenced this pull request Apr 23, 2021

Bump elastic stack version automation (#25148)

1476fef

(cherry picked from commit cc29196) # Conflicts: # .mergify.yml

mergify bot mentioned this pull request Apr 23, 2021

Bump elastic stack version automation (backport #25148) #25284

Merged

v1v pushed a commit that referenced this pull request Apr 26, 2021

Bump elastic stack version automation (#25148) (#25282)

2df45c7

v1v pushed a commit that referenced this pull request Apr 26, 2021

Bump elastic stack version automation (#25148) (#25283)

7dae23b

v1v pushed a commit that referenced this pull request Apr 26, 2021

Bump elastic stack version automation (#25148) (#25284)

ec2c242

v1v mentioned this pull request Apr 26, 2021

Bump elastic stack version automation elastic/package-registry#691

Closed

mergify bot pushed a commit that referenced this pull request Jul 19, 2021

Bump elastic stack version automation (#25148)

0badd01

(cherry picked from commit cc29196) # Conflicts: # .gitignore # .mergify.yml

mergify bot mentioned this pull request Jul 19, 2021

Bump elastic stack version automation (backport #25148) #26956

Merged

v1v pushed a commit that referenced this pull request Jul 19, 2021

Bump elastic stack version automation (backport #25148) (#26956)

634215d

leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023

Bump elastic stack version automation (elastic#25148) (elastic#25284)

2ee8227

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bump elastic stack version automation #25148

Bump elastic stack version automation #25148

v1v commented Apr 19, 2021 •

edited

Loading

elasticmachine commented Apr 19, 2021 •

edited by jenkins-beats-ci bot

Loading

Build stats

Trends 🧪

v1v commented Apr 19, 2021

jsoriano Apr 20, 2021

andrewkroh commented Apr 20, 2021

ruflin commented Apr 21, 2021

v1v commented Apr 21, 2021

v1v Apr 21, 2021

jsoriano left a comment

v1v commented Jul 19, 2021

mergify bot commented Jul 19, 2021

Bump elastic stack version automation #25148

Bump elastic stack version automation #25148

Conversation

v1v commented Apr 19, 2021 • edited Loading

What does this PR do?

Why is it important?

Tests

elasticmachine commented Apr 19, 2021 • edited by jenkins-beats-ci bot Loading

💚 Build Succeeded

Build stats

Trends 🧪

❕ Flaky test report

v1v commented Apr 19, 2021

jsoriano Apr 20, 2021

Choose a reason for hiding this comment

andrewkroh commented Apr 20, 2021

ruflin commented Apr 21, 2021

v1v commented Apr 21, 2021

v1v Apr 21, 2021

Choose a reason for hiding this comment

jsoriano left a comment

Choose a reason for hiding this comment

v1v commented Jul 19, 2021

mergify bot commented Jul 19, 2021

v1v commented Apr 19, 2021 •

edited

Loading

elasticmachine commented Apr 19, 2021 •

edited by jenkins-beats-ci bot

Loading