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(sct_config): appendable configuration values #9614

Merged
merged 1 commit into from
Dec 31, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Dec 24, 2024

introduce new option for appending to string or list configuration values

  1. strings: can be appended with adding ++ at the begining of the string:
    export SCT_APPEND_SCYLLA_ARGS="++ --overprovisioned 1"

  2. list: can be appended by adding ++ as the first item of the list
    export SCT_SCYLLA_D_OVERRIDES_FILES='["++", "extra_file/scylla.d/io.conf"]'

Note list would work on every config defiend with str_or_list_or_eval with the expection of config_files, region_name, gce_datacenter and gce_datacenter which can't be appended, and would need to be overriden completly

Ref: #7653

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 e80f2bf)

Parent PR: #9554

@mergify mergify bot added the conflicts label Dec 24, 2024
@mergify mergify bot assigned fruch Dec 24, 2024
Copy link
Author

mergify bot commented Dec 24, 2024

Cherry-pick of e80f2bf has failed:

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

You are currently cherry-picking commit e80f2bf3.
  (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:   unit_tests/test_teardown_validator.py

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docs/configuration_options.md
	both modified:   sdcm/sct_config.py
	both modified:   unit_tests/test_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 December 24, 2024 11:19
@fruch fruch force-pushed the mergify/bp/branch-2024.2/pr-9554 branch from ac18623 to 9e1914f Compare December 25, 2024 22:07
@fruch fruch removed the conflicts label Dec 25, 2024
@fruch fruch marked this pull request as ready for review December 25, 2024 22:07
introduce new option for appending to string or list configuration values

1) strings: can be appended with adding `++` at the begining of the string:
   `export SCT_APPEND_SCYLLA_ARGS="++ --overprovisioned 1"`

2) list: can be appended by adding `++` as the first item of the list
   `export SCT_SCYLLA_D_OVERRIDES_FILES='["++", "extra_file/scylla.d/io.conf"]'`

Note list would work on every config defiend with `str_or_list_or_eval`
with the expection of `config_files`, `region_name`, `gce_datacenter` and `gce_datacenter`
which can't be appended, and would need to be overriden completly

Ref: #7653
(cherry picked from commit e80f2bf)
@fruch fruch force-pushed the mergify/bp/branch-2024.2/pr-9554 branch from 9e1914f to d6c8f13 Compare December 30, 2024 13:14
@fruch fruch merged commit 7099679 into branch-2024.2 Dec 31, 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.

1 participant