Skip to content

[7.17](backport #37153) ironbank: rename ubi9 to ubi image#37205

Merged
v1v merged 2 commits into7.17from
mergify/bp/7.17/pr-37153
Nov 27, 2023
Merged

[7.17](backport #37153) ironbank: rename ubi9 to ubi image#37205
v1v merged 2 commits into7.17from
mergify/bp/7.17/pr-37153

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Nov 27, 2023

This is an automatic backport of pull request #37153 done by Mergify.
Cherry-pick of 296183c has failed:

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

You are currently cherry-picking commit 296183ca0d.
  (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/packaging/packages.yml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .ci/packaging.groovy
	both modified:   Jenkinsfile

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 296183c)

# Conflicts:
#	.ci/packaging.groovy
#	Jenkinsfile
@mergify mergify bot requested a review from a team as a code owner November 27, 2023 09:40
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Nov 27, 2023
@mergify mergify bot requested review from belimawr and faec and removed request for a team November 27, 2023 09:40
@mergify mergify bot assigned v1v Nov 27, 2023
@botelastic botelastic bot added the needs_team Indicates that the issue/PR needs a Team:* label label Nov 27, 2023
@botelastic
Copy link

botelastic bot commented Nov 27, 2023

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

@v1v
Copy link
Member

v1v commented Nov 27, 2023

/package

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Nov 27, 2023
@v1v v1v enabled auto-merge (squash) November 27, 2023 11:19
@elasticmachine
Copy link
Contributor

💚 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: 158 min 36 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 v1v merged commit cc0fbbe into 7.17 Nov 27, 2023
@v1v v1v deleted the mergify/bp/7.17/pr-37153 branch November 27, 2023 12:19
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.

2 participants