Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 18, 2025

deps: Bump ironbank version

deps(ironbank): Bump ubi version to 9.7

changed lines [7] of file "/tmp/updatecli/github/elastic/apm-server/packaging/ironbank/Dockerfile"

deps(ironbank): Bump ubi version to 9.7

change detected: * key "$.args.BASE_TAG" updated from "\"9.6\"" to "\"9.7\"", in file "packaging/ironbank/hardening_manifest.yaml"

GitHub Action workflow link
Updatecli logo

Created automatically by Updatecli

Options:

Most of Updatecli configuration is done via its manifest(s).

  • If you close this pull request, Updatecli will automatically reopen it, the next time it runs.
  • If you close this pull request and delete the base branch, Updatecli will automatically recreate it, erasing all previous commits made.

Feel free to report any issues at github.com/updatecli/updatecli.
If you find this tool useful, do not hesitate to star our GitHub repository as a sign of appreciation, and/or to tell us directly on our chat!


This is an automatic backport of pull request #19558 done by [Mergify](https://mergify.com).

* chore: deps(ironbank): Bump ubi version to 9.7

Made with ❤️️ by updatecli

* chore: deps(ironbank): Bump ubi version to 9.7

Made with ❤️️ by updatecli

* Apply suggestions from code review

---------

Co-authored-by: elastic-observability-automation[bot] <180520183+elastic-observability-automation[bot]@users.noreply.github.com>
Co-authored-by: Victor Martinez <[email protected]>
(cherry picked from commit 154b806)

# Conflicts:
#	packaging/ironbank/hardening_manifest.yaml
@mergify mergify bot added the backport label Nov 18, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 18, 2025

Cherry-pick of 154b806 has failed:

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

You are currently cherry-picking commit 154b8060.
  (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

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

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

@mergify mergify bot added the conflicts There is a conflict in the backported pull request label Nov 18, 2025
@github-actions
Copy link
Contributor

🤖 GitHub comments

Just comment with:

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

@mergify
Copy link
Contributor Author

mergify bot commented Nov 24, 2025

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

@kruskall kruskall removed the conflicts There is a conflict in the backported pull request label Nov 24, 2025
@mergify mergify bot added the queued label Nov 24, 2025
mergify bot added a commit that referenced this pull request Nov 24, 2025
mergify bot added a commit that referenced this pull request Nov 24, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 24, 2025

Merge Queue Status Beta

🚫 The pull request has left the queue (rule: default)

This pull request spent 21 hours 47 minutes 22 seconds in the queue, with no time waiting for CI.
The checks were run on draft #19678.

Required conditions to merge

Reason

The pull request #19588 has been manually updated

Hint

If you want to requeue this pull request, you can post a @mergifyio requeue comment.

mergify bot added a commit that referenced this pull request Nov 25, 2025
@kruskall kruskall enabled auto-merge (squash) November 25, 2025 08:16
@mergify mergify bot removed the queued label Nov 25, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 25, 2025

Merge Queue Status Beta

🚫 The pull request has left the queue (rule: default)

This pull request spent 5 hours 9 minutes 31 seconds in the queue, with no time waiting for CI.
The checks were run on draft #19699.

Required conditions to merge

Reason

The pull request #19588 has been manually updated

Hint

If you want to requeue this pull request, you can post a @mergifyio requeue comment.

@mergify mergify bot added the queued label Nov 25, 2025
mergify bot added a commit that referenced this pull request Nov 25, 2025
@kruskall kruskall disabled auto-merge November 25, 2025 12:00
mergify bot added a commit that referenced this pull request Nov 25, 2025
mergify bot added a commit that referenced this pull request Nov 25, 2025
@mergify mergify bot removed the queued label Nov 25, 2025
@mergify
Copy link
Contributor Author

mergify bot commented Nov 25, 2025

Merge Queue Status Beta

✅ The pull request has been merged

This pull request spent 3 days 3 hours 10 minutes 6 seconds in the queue, including 14 minutes 27 seconds waiting for CI.
The checks were run on draft #19756.

Required conditions to merge

@mergify mergify bot added the queued label Nov 25, 2025
mergify bot added a commit that referenced this pull request Nov 25, 2025
@elasticmachine
Copy link
Contributor

💚 Build Succeeded

History

@mergify
Copy link
Contributor Author

mergify bot commented Nov 25, 2025

queue

🟠 The pull request is queued to be merged

Branch 7.17 (0ce50fe) and #19588 are embarked together for merge.

Required conditions of queue default for merge:

Required conditions to stay in the queue:

  • -closed [📌 queue requirement]
  • -conflict [📌 queue requirement]
  • -draft [📌 queue requirement]
  • any of: [📌 queue -> configuration change requirements]
    • -mergify-configuration-changed
    • check-success = Configuration changed
  • any of: [🔀 queue conditions]
    • all of: [📌 queue conditions of queue default]
      • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
      • any of: [🛡 GitHub branch protection]
        • check-success = CLA
        • check-neutral = CLA
        • check-skipped = CLA
      • any of: [🛡 GitHub branch protection]
        • check-success = go-system-tests
        • check-neutral = go-system-tests
        • check-skipped = go-system-tests
      • any of: [🛡 GitHub branch protection]
        • check-success = lint
        • check-neutral = lint
        • check-skipped = lint
      • any of: [🛡 GitHub branch protection]
        • check-success = python-system-tests
        • check-neutral = python-system-tests
        • check-skipped = python-system-tests
      • any of: [🛡 GitHub branch protection]
        • check-success = buildkite/docs-build-pr
        • check-neutral = buildkite/docs-build-pr
        • check-skipped = buildkite/docs-build-pr
  • #approved-reviews-by >= 1 [🛡 GitHub branch protection]
  • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
  • #approved-reviews-by >= 1 [🛡 GitHub repository ruleset rule]
  • #changes-requested-reviews-by = 0 [🛡 GitHub branch protection]
  • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
  • #changes-requested-reviews-by = 0 [🛡 GitHub repository ruleset rule]
  • any of [🛡 GitHub branch protection]:
    • check-success = CLA
    • check-neutral = CLA
    • check-skipped = CLA
  • any of [🛡 GitHub branch protection]:
    • check-success = go-system-tests
    • check-neutral = go-system-tests
    • check-skipped = go-system-tests
  • any of [🛡 GitHub branch protection]:
    • check-success = lint
    • check-neutral = lint
    • check-skipped = lint
  • any of [🛡 GitHub branch protection]:
    • check-success = python-system-tests
    • check-neutral = python-system-tests
    • check-skipped = python-system-tests
  • any of [🛡 GitHub branch protection]:
    • check-success = buildkite/docs-build-pr
    • check-neutral = buildkite/docs-build-pr
    • check-skipped = buildkite/docs-build-pr

@v1v v1v enabled auto-merge (squash) November 28, 2025 11:58
@v1v
Copy link
Member

v1v commented Nov 28, 2025

#19755 should unblock this PR

mergify bot added a commit that referenced this pull request Nov 28, 2025
@mergify mergify bot merged commit 4aae7f8 into 7.17 Nov 28, 2025
14 checks passed
@mergify mergify bot deleted the mergify/bp/7.17/pr-19558 branch November 28, 2025 17:04
@mergify mergify bot removed the queued label Nov 28, 2025
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.

4 participants