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(test_workload_types): adjust workload comparison for 2024.2 #9016

Draft
wants to merge 1 commit into
base: branch-2024.2
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Oct 20, 2024

adjust change #8922 to work with 2024.2 (https://argus.scylladb.com/tests/scylla-cluster-tests/c4fbed30-dc6d-4eee-b901-d8cb7d3c6519)
and use ComparableScyllaVersion SCT utility as suggested

fixes: #8961

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 9018c7f)

Parent PR: #9014

adjust change #8922
to work with 2024.2
and use ComparableScyllaVersion SCT utility as suggested

(cherry picked from commit 9018c7f)

# Conflicts:
#	sla_per_user_system_test.py
@mergify mergify bot added the conflicts label Oct 20, 2024
Copy link
Author

mergify bot commented Oct 20, 2024

Cherry-pick of 9018c7f has failed:

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

You are currently cherry-picking commit 9018c7f23.
  (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:   sla_per_user_system_test.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 October 20, 2024 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant