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(artifacts): fixes around amazon 2 support removel #9290

Merged
merged 1 commit into from
Nov 28, 2024

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Nov 19, 2024

changes in 1568a5a, by mistake broke few minor logic with installation of java for offline installers and with setup of scylla doctor.

this commit addresses those, and fix the logic around both

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

Parent PR: #9231

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

mergify bot commented Nov 19, 2024

Cherry-pick of eba5055 has failed:

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

You are currently cherry-picking commit eba50550c.
  (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)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   sdcm/cluster.py
	both modified:   utils/scylla_doctor.py

no changes added to commit (use "git add" and/or "git commit -a")

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 19, 2024 15:15
changes in 1568a5a, by mistake
broke few minor logic with installation of java for offline installers
and with setup of scylla doctor.

this commit addresses those, and fix the logic around both

(cherry picked from commit eba5055)
@fruch fruch force-pushed the mergify/bp/branch-2024.2/pr-9231 branch from d61409a to 3b22c65 Compare November 20, 2024 13:24
@fruch fruch marked this pull request as ready for review November 20, 2024 13:24
@fruch fruch removed the conflicts label Nov 20, 2024
@fruch fruch merged commit 19d1668 into branch-2024.2 Nov 28, 2024
4 of 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