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] ironbank: ubi9:9.2 (backport #11785) #11813

Merged
merged 4 commits into from
Oct 16, 2023
Merged

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Oct 10, 2023

This is an automatic backport of pull request #11785 done by Mergify.
Cherry-pick of 3f14076 has failed:

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

You are currently cherry-picking commit 3f140768c.
  (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:   packaging/ironbank/Dockerfile.tmpl

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   packaging/ironbank/hardening_manifest.yaml.tmpl

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

(cherry picked from commit 3f14076)

# Conflicts:
#	packaging/ironbank/hardening_manifest.yaml.tmpl
@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Oct 10, 2023
@mergify mergify bot assigned v1v Oct 10, 2023
@v1v v1v added backport and removed conflicts There is a conflict in the backported pull request labels Oct 10, 2023
@mergify
Copy link
Contributor Author

mergify bot commented Oct 10, 2023

update

☑️ Nothing to do

  • #commits-behind>0 [:pushpin: update requirement]
  • -closed [:pushpin: update requirement]

@mergify
Copy link
Contributor Author

mergify bot commented Oct 10, 2023

refresh

✅ Pull request refreshed

@mergify
Copy link
Contributor Author

mergify bot commented Oct 10, 2023

queue

🛑 The pull request has been removed from the queue default

The queue conditions cannot be satisfied due to failing checks.

You can take a look at Queue: Embarked in merge queue check runs for more details.

In case of a failure due to a flaky test, you should first retrigger the CI.
Then, re-embark the pull request into the merge queue by posting the comment
@mergifyio refresh on the pull request.

@mergify
Copy link
Contributor Author

mergify bot commented Oct 16, 2023

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

@v1v
Copy link
Member

v1v commented Oct 16, 2023

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Oct 16, 2023

update

✅ Branch has been successfully updated

@v1v
Copy link
Member

v1v commented Oct 16, 2023

@Mergifyio update

@mergify
Copy link
Contributor Author

mergify bot commented Oct 16, 2023

update

✅ Branch has been successfully updated

@mergify mergify bot merged commit f382bd6 into 7.17 Oct 16, 2023
10 checks passed
@mergify mergify bot deleted the mergify/bp/7.17/pr-11785 branch October 16, 2023 07:50
v1v added a commit to v1v/apm-server that referenced this pull request Nov 2, 2023
@v1v v1v mentioned this pull request Nov 2, 2023
3 tasks
v1v added a commit that referenced this pull request Nov 2, 2023
* Revert "dra: rename ubi8 for ubi9 (#11990)"
* Revert "fix: correct base Docker image names (#11926) (#11928)"
* Revert "[7.17] ironbank: ubi9:9.2 (backport #11785) (#11813)"
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant