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 #37017) ironbank: move to ubi9 #37038

Merged
merged 3 commits into from
Nov 6, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Nov 6, 2023

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

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

You are currently cherry-picking commit d4630af1cf.
  (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:   dev-tools/dependencies-report
	modified:   dev-tools/packaging/packages.yml
	modified:   dev-tools/packaging/templates/docker/Dockerfile.tmpl
	modified:   dev-tools/packaging/templates/ironbank/auditbeat/hardening_manifest.yaml
	modified:   dev-tools/packaging/templates/ironbank/filebeat/Dockerfile
	modified:   dev-tools/packaging/templates/ironbank/filebeat/hardening_manifest.yaml
	modified:   dev-tools/packaging/templates/ironbank/heartbeat/Dockerfile
	modified:   dev-tools/packaging/templates/ironbank/heartbeat/hardening_manifest.yaml
	modified:   dev-tools/packaging/templates/ironbank/metricbeat/Dockerfile
	modified:   dev-tools/packaging/templates/ironbank/metricbeat/hardening_manifest.yaml
	modified:   dev-tools/packaging/templates/ironbank/packetbeat/Dockerfile
	modified:   dev-tools/packaging/templates/ironbank/packetbeat/hardening_manifest.yaml
	modified:   x-pack/heartbeat/ironbank/Makefile

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/packaging.groovy
	both modified:   Jenkinsfile
	both modified:   dev-tools/packaging/templates/ironbank/auditbeat/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

* ironbank: move to ubi9

* packaging: ubi-minimal 9 requires -y to bypass the prompt

---------

Co-authored-by: Pierre HILBERT <[email protected]>
(cherry picked from commit d4630af)

# Conflicts:
#	.ci/packaging.groovy
#	Jenkinsfile
#	dev-tools/packaging/templates/ironbank/auditbeat/Dockerfile
@mergify mergify bot requested review from a team as code owners November 6, 2023 08:54
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 6, 2023
@mergify mergify bot requested review from fearful-symmetry and faec and removed request for a team November 6, 2023 08:54
@mergify mergify bot assigned v1v Nov 6, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 6, 2023
Copy link
Contributor Author

mergify bot commented Nov 6, 2023

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

@pierrehilbert pierrehilbert requested a review from v1v November 6, 2023 08:56
@pierrehilbert pierrehilbert added the Team:Elastic-Agent Label for the Agent team label Nov 6, 2023
@botelastic botelastic bot removed the needs_team Indicates that the issue/PR needs a Team:* label label Nov 6, 2023
@pierrehilbert pierrehilbert removed request for a team, fearful-symmetry and faec November 6, 2023 08:56
.ci/packaging.groovy Outdated Show resolved Hide resolved
Jenkinsfile Outdated Show resolved Hide resolved
@@ -3,7 +3,7 @@
# Extract Elastic Agent and make various file manipulations.
################################################################################
ARG BASE_REGISTRY=registry1.dsop.io
ARG BASE_IMAGE=ironbank/redhat/ubi/ubi8
ARG BASE_IMAGE=redhat/ubi/ubi9
Copy link
Member

Choose a reason for hiding this comment

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

This change in addition to the dev-tools/packaging/templates/ironbank/elastic-agent/hardening_manifest.yaml are new since 7.17 does use elastic-agent

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Nov 6, 2023
@v1v v1v requested a review from pierrehilbert November 6, 2023 09:07
@elasticmachine
Copy link
Collaborator

elasticmachine commented Nov 6, 2023

💚 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

  • Duration: 164 min 48 sec

❕ Flaky test report

No test was executed to be analysed.

🤖 GitHub comments

Expand to view the 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!)

@v1v
Copy link
Member

v1v commented Nov 6, 2023

/package

@v1v v1v merged commit 45c4b05 into 7.17 Nov 6, 2023
8 checks passed
@v1v v1v deleted the mergify/bp/7.17/pr-37017 branch November 6, 2023 20:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Team:Elastic-Agent Label for the Agent team
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants