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] automate update-beats #5692

Merged
merged 5 commits into from
Jul 14, 2021
Merged

[CI] automate update-beats #5692

merged 5 commits into from
Jul 14, 2021

Conversation

v1v
Copy link
Member

@v1v v1v commented Jul 13, 2021

Motivation/summary

Jenkins job that:

  1. Runs make update-beats.
  2. Stages the changes to go.mod, go.sum, NOTICE.txt.
  3. Creates a PR.

ONLY on daily basis for the master branch. If needed, it's possible to trigger it on PR/tag/other-branches using the Jenkins UI.

Mergify does the rest:

  • auto-merge
  • delete-on-merge bits set

How to test these changes

Within the pipeline itself

Dry Run

image

No dry run

image

And created https://github.com/elastic/apm-server/pull/5703/files

NOTE: Bear in mind the PR was created on the top of this PR, that's the reason for having more changes. When running on the master branch, this should not be the case.

Related issues

Closes #4941
Requires #5690

Jenkinsfile Outdated
@@ -1,551 +1,104 @@
#!/usr/bin/env groovy
// Licensed to Elasticsearch B.V. under one or more contributor
Copy link
Member Author

Choose a reason for hiding this comment

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

For testing purposes

@v1v v1v mentioned this pull request Jul 13, 2021
.ci/update-beats.groovy Outdated Show resolved Hide resolved
@v1v
Copy link
Member Author

v1v commented Jul 13, 2021

Some errors with the make update-beats

16:28:00  diff -u .go-version $(/var/lib/jenkins/workspace/_server_update-beats-mbp_PR-5692/.gvm/versions/go1.16.5.linux.amd64/bin/go list -m -f {{.Dir}} github.com/elastic/beats/v7)/.go-version \
16:28:00  	|| { code=$?; echo ".go-version out of sync with Beats"; exit $code; }
16:28:00  /var/lib/jenkins/workspace/_server_update-beats-mbp_PR-5692/.gvm/versions/go1.16.5.linux.amd64/bin/go build -o build/linux/bin/mage github.com/magefile/mage
16:28:01  ./build/linux/bin/mage -compile=build/linux/mage
16:28:33  # github.com/elastic/apm-server/elasticsearch
16:28:33  elasticsearch/config.go:150:17: assignment mismatch: 2 variables but transport.TLSDialer returns 1 values
16:28:33  Error: error compiling magefiles
16:28:33  Makefile:273: recipe for target 'build/linux/mage' failed
16:28:33  make: *** [build/linux/mage] Error 1

@apmmachine
Copy link
Contributor

apmmachine commented Jul 13, 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 preview

Expand to view the summary

Build stats

  • Start Time: 2021-07-14T08:44:11.513+0000

  • Duration: 39 min 35 sec

  • Commit: 059ada2

Test stats 🧪

Test Results
Failed 0
Passed 5961
Skipped 14
Total 5975

Trends 🧪

Image of Build Times

Image of Tests

@v1v v1v marked this pull request as ready for review July 14, 2021 08:51
@v1v v1v requested review from a team July 14, 2021 08:52
@v1v v1v self-assigned this Jul 14, 2021
@v1v v1v added the automation label Jul 14, 2021
Copy link
Member

@axw axw left a comment

Choose a reason for hiding this comment

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

Awesome, thank you very much @v1v! ❤️

@v1v v1v merged commit bd10c37 into elastic:master Jul 14, 2021
@v1v v1v deleted the feature/update-beats-1 branch July 14, 2021 09:31
@simitt
Copy link
Contributor

simitt commented Jul 14, 2021

Amazing, thank you!

@v1v v1v added the backport-7.17 Automated backport with mergify to the 7.17 branch label Feb 2, 2022
@v1v
Copy link
Member Author

v1v commented Feb 2, 2022

@Mergifyio backport 7.17

mergify bot pushed a commit that referenced this pull request Feb 2, 2022
(cherry picked from commit bd10c37)

# Conflicts:
#	.ci/scripts/update-beats.sh
@mergify
Copy link
Contributor

mergify bot commented Feb 2, 2022

backport 7.17

✅ Backports have been created

v1v pushed a commit that referenced this pull request Feb 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automation backport-7.17 Automated backport with mergify to the 7.17 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

CI: automate update-beats
5 participants