Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Aug 28, 2024

Support for the ironbank bump automation for ubi9 using updatecli.
It uses https://www.updatecli.io/blog/shareable-policies, for such I refactored the files under .ci/updatecli and the consumers. So now all the scm configuration is in the values file.

Motivation/summary

Checklist

For functional changes, consider:

  • Is it observable through the addition of either logging or metrics?
  • Is its use being published in telemetry to enable product improvement?
  • Have system tests been added to avoid regression?

How to test these changes

Related issues


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

(cherry picked from commit 3351902)

# Conflicts:
#	.github/workflows/bump-golang.yml
@mergify mergify bot requested a review from a team as a code owner August 28, 2024 15:30
@mergify mergify bot added backport conflicts There is a conflict in the backported pull request labels Aug 28, 2024
@mergify mergify bot assigned v1v Aug 28, 2024
@mergify
Copy link
Contributor Author

mergify bot commented Aug 28, 2024

Cherry-pick of 3351902 has failed:

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

You are currently cherry-picking commit 3351902f8.
  (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:
	renamed:    .ci/bump-elastic-stack-snapshot.yml -> .ci/updatecli/bump-elastic-stack-snapshot.yml
	renamed:    .ci/bump-golang.yml -> .ci/updatecli/bump-golang.yml
	renamed:    .ci/update-beats.yml -> .ci/updatecli/update-beats.yml
	new file:   .ci/updatecli/values.d/ironbank.yml
	new file:   .ci/updatecli/values.d/scm.yml
	new file:   .ci/updatecli/values.d/updatecli-compose.yml
	modified:   .github/workflows/bump-elastic-stack.yml
	modified:   .github/workflows/update-beats.yml
	new file:   .github/workflows/update-compose.yml
	new file:   updatecli-compose.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   .github/workflows/bump-golang.yml

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

@v1v v1v removed the conflicts There is a conflict in the backported pull request label Aug 28, 2024
@v1v v1v enabled auto-merge (squash) August 28, 2024 16:19
@mergify mergify bot merged commit 5994d17 into 8.15 Aug 28, 2024
@mergify mergify bot deleted the mergify/bp/8.15/pr-13934 branch August 28, 2024 16:36
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