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

[7.17](backport #29681) Change docker image from CentOS 7 to Ubuntu 20.04 #29817

Merged
merged 3 commits into from
Jan 18, 2022

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Jan 12, 2022

This is an automatic backport of pull request #29681 done by Mergify.
Cherry-pick of febc7dd has failed:

On branch mergify/bp/7.17/pr-29681
Your branch is up to date with 'origin/7.17'.

You are currently cherry-picking commit febc7ddbfa.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   .ci/packer_cache.sh
	modified:   CHANGELOG.next.asciidoc
	modified:   auditbeat/Dockerfile
	modified:   dev-tools/packaging/templates/docker/Dockerfile.tmpl
	modified:   filebeat/Dockerfile
	modified:   heartbeat/Dockerfile
	modified:   libbeat/Dockerfile
	modified:   packetbeat/Dockerfile
	modified:   x-pack/functionbeat/Dockerfile
	modified:   x-pack/libbeat/Dockerfile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   dev-tools/packaging/packages.yml
	both modified:   dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
	both modified:   metricbeat/Dockerfile

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Switch to Ubuntu 20.04.

* Fix Dockerfile.

* Change to amd64 in Dockerfile.tmpl.

* Add missing curl and ca-certificate deps. Change back to x86_64.

* Fix issues with setcap and xz extraction.

* Add changelog, fix remaining issues.

* Fix synthetics deps

* Fix apt-get. Remove todo from packages.yml.

Co-authored-by: Andrew Cholakian <[email protected]>
(cherry picked from commit febc7dd)

# Conflicts:
#	dev-tools/packaging/packages.yml
#	dev-tools/packaging/templates/docker/Dockerfile.elastic-agent.tmpl
#	metricbeat/Dockerfile
@mergify mergify bot requested review from a team as code owners January 12, 2022 14:39
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Jan 12, 2022
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Jan 12, 2022
@botelastic
Copy link

botelastic bot commented Jan 12, 2022

This pull request doesn't have a Team:<team> label.

@v1v
Copy link
Member

v1v commented Jan 12, 2022

I'm afraid the conflict is related to #28134, this particular change was requested to only apply in the >= 8.0 versions

@blakerouse
Copy link
Contributor

blakerouse commented Jan 12, 2022

@v1v no it must go to 7.17 that is the reason for 7.17.

Working on the conflicts now.

@blakerouse
Copy link
Contributor

@v1v Sorry I think you meant the -cloud change was only for 8.0. That seems correct, but need the Ubuntu 20.04 base to go to 7.17.

Was able to clean it up easily, removing the -cloud items.

@elasticmachine
Copy link
Collaborator

elasticmachine commented Jan 12, 2022

💔 Build Failed

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: 2022-01-13T18:40:12.086+0000

  • Duration: 108 min 39 sec

  • Commit: 1185763

Test stats 🧪

Test Results
Failed 0
Passed 37833
Skipped 4430
Total 42263

💚 Flaky test report

Tests succeeded.

🤖 GitHub comments

To re-run your PR in the CI, just comment with:

  • /test : Re-trigger the build.

  • /package : Generate the packages and run the E2E tests.

  • /beats-tester : Run the installation tests with beats-tester.

  • run elasticsearch-ci/docs : Re-trigger the docs validation. (use unformatted text in the comment!)

@blakerouse blakerouse removed the conflicts There is a conflict in the backported pull request label Jan 13, 2022
@blakerouse
Copy link
Contributor

/test

@blakerouse
Copy link
Contributor

/package

1 similar comment
@blakerouse
Copy link
Contributor

/package

@mergify
Copy link
Contributor Author

mergify bot commented Jan 17, 2022

This pull request has not been merged yet. Could you please review and merge it @blakerouse? 🙏

@blakerouse
Copy link
Contributor

/package

@blakerouse
Copy link
Contributor

The PR doesn't show it, because the run failed due to a network issue. I re-ran it manually and it passed packaging as well.

https://beats-ci.elastic.co/blue/organizations/jenkins/Beats%2Fpackaging/detail/PR-29817/9/pipeline/

@blakerouse blakerouse merged commit 5d84131 into 7.17 Jan 18, 2022
@blakerouse blakerouse deleted the mergify/bp/7.17/pr-29681 branch January 18, 2022 16:20
v1v added a commit that referenced this pull request Jan 28, 2022
* upstream/7.17: (30 commits)
  [7.17](backport #29966) Add the Elastic product origin header when talking to Elasticsearch or Kibana. (#30000)
  [Heartbeat] Change size of data on ICMP packet (#29948) (#29978)
  Add clarification about enableing dashboard loading (#29985) (#29989)
  Improve aws-s3 gzip file detection to avoid false negatives (#29969) (#29974)
  ci: docker login step for pulling then pushing (#29960) (#29963)
  x-pack/auditbeat/module/system/socket: get full length path and arg from /proc when not available from kprobe (#29410) (#29958)
  [Automation] Update elastic stack version to 7.17.0-ab4975a2 for testing (#29956)
  [Automation] Update elastic stack version to 7.17.0-1bd58b32 for testing (#29938)
  [7.17](backport #29913) [Metricbeat] gcp.gke: fix overview dashboard (#29914)
  [7.17](backport #29605) Fix annotation enrichment (#29834)
  [Automation] Update elastic stack version to 7.17.0-e1efbe3a for testing (#29922)
  [Automation] Update elastic stack version to 7.17.0-68da5d12 for testing (#29904)
  [7.17][Heartbeat] Defer monitor / ICMP errors to monitor runtime / ES (backport #29413) (#29896)
  Merge pull request from GHSA-rj4h-hqvq-cc6q
  [7.17](backport #29681) Change docker image from CentOS 7 to Ubuntu 20.04 (#29817)
  Fix YAML indentation in `parsers` examples (#29663) (#29894)
  [Automation] Update elastic stack version to 7.17.0-079761a0 for testing (#29864)
  Fix Filebeat dissect processor field tokenization in documentation (#29680) (#29883)
  Enable require_alias for Bulk requests for all actions when target is a write alias (#29879)
  Update Index template loading guide to use the correct endpoint (#29869) (#29877)
  ...
leweafan pushed a commit to leweafan/beats that referenced this pull request Apr 28, 2023
* upstream/7.17: (30 commits)
  [7.17](backport elastic#29966) Add the Elastic product origin header when talking to Elasticsearch or Kibana. (elastic#30000)
  [Heartbeat] Change size of data on ICMP packet (elastic#29948) (elastic#29978)
  Add clarification about enableing dashboard loading (elastic#29985) (elastic#29989)
  Improve aws-s3 gzip file detection to avoid false negatives (elastic#29969) (elastic#29974)
  ci: docker login step for pulling then pushing (elastic#29960) (elastic#29963)
  x-pack/auditbeat/module/system/socket: get full length path and arg from /proc when not available from kprobe (elastic#29410) (elastic#29958)
  [Automation] Update elastic stack version to 7.17.0-ab4975a2 for testing (elastic#29956)
  [Automation] Update elastic stack version to 7.17.0-1bd58b32 for testing (elastic#29938)
  [7.17](backport elastic#29913) [Metricbeat] gcp.gke: fix overview dashboard (elastic#29914)
  [7.17](backport elastic#29605) Fix annotation enrichment (elastic#29834)
  [Automation] Update elastic stack version to 7.17.0-e1efbe3a for testing (elastic#29922)
  [Automation] Update elastic stack version to 7.17.0-68da5d12 for testing (elastic#29904)
  [7.17][Heartbeat] Defer monitor / ICMP errors to monitor runtime / ES (backport elastic#29413) (elastic#29896)
  Merge pull request from GHSA-rj4h-hqvq-cc6q
  [7.17](backport elastic#29681) Change docker image from CentOS 7 to Ubuntu 20.04 (elastic#29817)
  Fix YAML indentation in `parsers` examples (elastic#29663) (elastic#29894)
  [Automation] Update elastic stack version to 7.17.0-079761a0 for testing (elastic#29864)
  Fix Filebeat dissect processor field tokenization in documentation (elastic#29680) (elastic#29883)
  Enable require_alias for Bulk requests for all actions when target is a write alias (elastic#29879)
  Update Index template loading guide to use the correct endpoint (elastic#29869) (elastic#29877)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport needs_team Indicates that the issue/PR needs a Team:* label
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants