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

[Backport 2024.2] feature(dependabot): scan docker based loaders for updates #9336

Merged
merged 1 commit into from
Nov 25, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 22, 2024

since dependabot is expecting very specific format of yaml files it can find and update:

  • name starts with values_
  • docker image need to be under image key

since we use same dockerhub repo for most of the loader images and dependabot only handle update of one of them, we had to split it to multiple files that would be scan seperatly. sct_config would collect all of those back into the configuration in the same structure it was until this change

Testing

  • [ ]

PR pre-checks (self review)

  • I added the relevant backport labels
  • I didn't leave commented-out/debugging code

Reminders

  • Add New configuration option and document them (in sdcm/sct_config.py)
  • Add unit tests to cover my changes (under unit-test/ folder)
  • Update the Readme/doc folder relevant to this change (if needed)

(cherry picked from commit 5002022)

Parent PR: #9291

@mergify mergify bot added the conflicts label Nov 22, 2024
@mergify mergify bot assigned fruch Nov 22, 2024
Copy link
Author

mergify bot commented Nov 22, 2024

Cherry-pick of 5002022 has failed:

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

You are currently cherry-picking commit 500202246.
  (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:   .github/dependabot.yml
	new file:   defaults/docker_images/alternator-dns/values_alternator-dns.yaml
	new file:   defaults/docker_images/cassandra-stress/values_cassandra-stress.yaml
	new file:   defaults/docker_images/cdc-stresser/values_cdc-stresser.yaml
	new file:   defaults/docker_images/cql-stress-cassandra-stress/values_cql-stress-cassandra-stress.yaml
	new file:   defaults/docker_images/gemini/values_gemini.yaml
	new file:   defaults/docker_images/harry/values_harry.yaml
	new file:   defaults/docker_images/kcl/values_kcl.yaml
	new file:   defaults/docker_images/latte/values_latte.yaml
	new file:   defaults/docker_images/ndbench/values_ndbench.yaml
	new file:   defaults/docker_images/nosqlbench/values_nosqlbench.yaml
	new file:   defaults/docker_images/scylla-bench/values_scylla-bench.yaml
	new file:   defaults/docker_images/ycsb/values_ycsb.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   defaults/test_default.yaml
	both modified:   sdcm/sct_config.py

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 marked this pull request as draft November 22, 2024 12:57
since dependabot is expecting very specific format of yaml files
it can find and update:
* name starts with `values_`
* docker image need to be under `image` key

since we use same dockerhub repo for most of the loader images
and dependabot only handle update of one of them, we had to split
it to multiple files that would be scan seperatly.
`sct_config` would collect all of those back into the configuration
in the same structure it was until this change

(cherry picked from commit 5002022)
@fruch fruch force-pushed the mergify/bp/branch-2024.2/pr-9291 branch from e48e188 to 276ebb6 Compare November 24, 2024 12:26
@fruch fruch removed the conflicts label Nov 24, 2024
@fruch fruch marked this pull request as ready for review November 24, 2024 12:26
@fruch fruch merged commit bf2687d into branch-2024.2 Nov 25, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants