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] fix(nemesis): fix network block nemesis #8248

Merged
merged 1 commit into from
Aug 6, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Aug 5, 2024

Due required update of tc-config to version 0.28.1, network block nemesis broke.

Issue has been fixed in tcconfig 0.29.0 so updating it.

fixes: #8064

Testing

  • - tested locally (could be reproduced easily by running tcset lo --loss 1% --tc-command

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 1e2ab0e)

Parent PR: #8223

@mergify mergify bot added the conflicts label Aug 5, 2024
@mergify mergify bot assigned soyacz Aug 5, 2024
Copy link
Author

mergify bot commented Aug 5, 2024

Cherry-pick of 1e2ab0e has failed:

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

You are currently cherry-picking commit 1e2ab0ec9.
  (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:   requirements.in

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   docker/env/version
	both modified:   requirements.txt

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 August 5, 2024 18:58
@fruch
Copy link
Contributor

fruch commented Aug 6, 2024

@soyacz one more reason to update the docker images on those.

lets backport the needed changes to the docker image to 6.0, 6.1, 2024.2, one by one, and let's try keep them in sync with master in that regards as much as possible

@soyacz
Copy link
Contributor

soyacz commented Aug 6, 2024

@soyacz one more reason to update the docker images on those.

lets backport the needed changes to the docker image to 6.0, 6.1, 2024.2, one by one, and let's try keep them in sync with master in that regards as much as possible

I totally agree.
Is there a way to recreate backport with mergify? After backporting previous ones these would be mergable without conflicts resolution.

Due required update of tc-config to version 0.28.1, network block
nemesis broke.

Issue has been fixed in tcconfig 0.29.0 so updating it.

fixes: #8064
(cherry picked from commit 1e2ab0e)
@soyacz soyacz force-pushed the mergify/bp/branch-2024.2/pr-8223 branch from be831c6 to 0d4f8ba Compare August 6, 2024 09:24
@soyacz soyacz marked this pull request as ready for review August 6, 2024 09:24
@soyacz soyacz removed the conflicts label Aug 6, 2024
@mergify mergify bot marked this pull request as draft August 6, 2024 09:24
@soyacz soyacz marked this pull request as ready for review August 6, 2024 09:25
@soyacz soyacz merged commit 17d97e5 into branch-2024.2 Aug 6, 2024
6 checks passed
@mergify mergify bot deleted the mergify/bp/branch-2024.2/pr-8223 branch August 6, 2024 10:35
@fruch
Copy link
Contributor

fruch commented Aug 6, 2024

@soyacz one more reason to update the docker images on those.
lets backport the needed changes to the docker image to 6.0, 6.1, 2024.2, one by one, and let's try keep them in sync with master in that regards as much as possible

I totally agree. Is there a way to recreate backport with mergify? After backporting previous ones these would be mergable without conflicts resolution.

there isn't, one need to manually rebase and solved the issues
you can open an issue for them:
https://github.com/Mergifyio/mergify/issues

and ask them about it

@soyacz
Copy link
Contributor

soyacz commented Aug 7, 2024

@soyacz one more reason to update the docker images on those.
lets backport the needed changes to the docker image to 6.0, 6.1, 2024.2, one by one, and let's try keep them in sync with master in that regards as much as possible

I totally agree. Is there a way to recreate backport with mergify? After backporting previous ones these would be mergable without conflicts resolution.

there isn't, one need to manually rebase and solved the issues you can open an issue for them: https://github.com/Mergifyio/mergify/issues

and ask them about it

Mergifyio/mergify#5121

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