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.

Sign up for GitHub

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

Jump to bottom

Support configuring ScyllaDB and Scylla Manager versions for e2e tests with flags #2355

Merged
merged 1 commit into from
Feb 6, 2025
Merged

Support configuring ScyllaDB and Scylla Manager versions for e2e tests with flags #2355

merged 1 commit into from
Feb 6, 2025

Conversation

grzywin
Copy link
Contributor

@grzywin grzywin commented Jan 29, 2025 •
edited
Loading

Description of your changes:
This PR makes the flags for ScyllaDB and Scylla Manager versions configurable. Hardcoded values (versions) in config.yaml will be overwritten by the ones passed as arguments.

Which issue is resolved by this Pull Request:
Resolves #2320

@scylla-operator-bot scylla-operator-bot
Copy link
Contributor

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@scylla-operator-bot scylla-operator-bot bot added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority Indicates a PR lacks a `priority/foo` label and requires one. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 29, 2025
@grzywin grzywin requested review from rzetelskik and zimnx January 29, 2025 16:01
@grzywin grzywin force-pushed the get_scylla_versions_from_args branch 2 times, most recently from ca60028 to 9e9aef7 Compare January 30, 2025 15:52
@grzywin grzywin changed the title Added flags to ScyllaDB and Manager to be able to test pre-released versions Make ScyllaDB ad Scylla Manager flags configurable for e2e tests Jan 30, 2025
@grzywin grzywin force-pushed the get_scylla_versions_from_args branch from 9e9aef7 to a77717f Compare January 30, 2025 15:59
@grzywin grzywin changed the title Make ScyllaDB ad Scylla Manager flags configurable for e2e tests Make ScyllaDB and Scylla Manager flags configurable for e2e tests Jan 30, 2025
@grzywin grzywin force-pushed the get_scylla_versions_from_args branch from a77717f to 919da81 Compare January 30, 2025 16:02
@grzywin grzywin marked this pull request as ready for review January 30, 2025 16:07
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Jan 30, 2025
rzetelskik
rzetelskik reviewed Jan 30, 2025
View reviewed changes
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
hack/.ci/lib/e2e.sh Outdated Show resolved Hide resolved
hack/ci-deploy.sh Outdated Show resolved Hide resolved
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
@scylla-operator-bot scylla-operator-bot bot added the area/dependency Issues or PRs related to dependency changes label Jan 31, 2025
@grzywin grzywin force-pushed the get_scylla_versions_from_args branch from 920f561 to 5c0d888 Compare January 31, 2025 13:17
@scylla-operator-bot scylla-operator-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Jan 31, 2025
@grzywin grzywin force-pushed the get_scylla_versions_from_args branch 4 times, most recently from bee1e6a to e3444bc Compare January 31, 2025 22:19
@grzywin grzywin changed the title Make ScyllaDB and Scylla Manager flags configurable for e2e tests Make ScyllaDB and Scylla Manager flags configurable Feb 1, 2025
@grzywin grzywin added the kind/design Categorizes issue or PR as related to design. label Feb 1, 2025
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/needs-kind Indicates a PR lacks a `kind/foo` label and requires one. label Feb 1, 2025
rzetelskik
rzetelskik reviewed Feb 3, 2025
View reviewed changes
Copy link
Member

@rzetelskik rzetelskik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@grzywin thanks for the updates.

Please don't resolve comments - it should be done by the reviewer to track what was actually done.

Also the commit name "Update generated" is misleading - you're updating dependencies, not generated files.

pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
@grzywin grzywin force-pushed the get_scylla_versions_from_args branch from 6b63a08 to 9842690 Compare February 3, 2025 21:47
@scylla-operator-bot scylla-operator-bot bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Feb 3, 2025
@grzywin grzywin force-pushed the get_scylla_versions_from_args branch from f6e57be to c1096e8 Compare February 3, 2025 21:51
@grzywin grzywin marked this pull request as ready for review February 3, 2025 21:53
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 3, 2025
rzetelskik
rzetelskik reviewed Feb 5, 2025
View reviewed changes
Copy link
Member

@rzetelskik rzetelskik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thanks for the updates, a few more comments, mostly nits

pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
hack/.ci/lib/e2e.sh Outdated Show resolved Hide resolved
hack/.ci/lib/e2e.sh Outdated Show resolved Hide resolved
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
@grzywin grzywin marked this pull request as draft February 5, 2025 11:58
@scylla-operator-bot scylla-operator-bot bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 5, 2025
@grzywin grzywin force-pushed the get_scylla_versions_from_args branch from ee7b204 to b1c1643 Compare February 5, 2025 12:00
@grzywin grzywin marked this pull request as ready for review February 5, 2025 12:00
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 5, 2025
rzetelskik
rzetelskik reviewed Feb 6, 2025
View reviewed changes
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
test/e2e/set/scyllacluster/scyllacluster_upgrades.go Show resolved Hide resolved
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
pkg/cmd/tests/options.go Outdated Show resolved Hide resolved
@grzywin grzywin marked this pull request as draft February 6, 2025 09:13
@scylla-operator-bot scylla-operator-bot bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 6, 2025
@grzywin grzywin force-pushed the get_scylla_versions_from_args branch from e19f006 to b2d7fb1 Compare February 6, 2025 09:14
@grzywin grzywin marked this pull request as ready for review February 6, 2025 09:14
@scylla-operator-bot scylla-operator-bot bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Feb 6, 2025
rzetelskik
rzetelskik approved these changes Feb 6, 2025
View reviewed changes
Copy link
Member

@rzetelskik rzetelskik left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm
thanks Kamil!

@scylla-operator-bot scylla-operator-bot bot added the lgtm Indicates that a PR is ready to be merged. label Feb 6, 2025
@scylla-operator-bot scylla-operator-bot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: grzywin, rzetelskik

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@scylla-operator-bot scylla-operator-bot bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 6, 2025
@scylla-operator-bot scylla-operator-bot bot merged commit 8e6507c into scylladb:master Feb 6, 2025
14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@rzetelskik rzetelskik rzetelskik approved these changes

@mflendrich mflendrich Awaiting requested review from mflendrich

@zimnx zimnx Awaiting requested review from zimnx

Assignees

@rzetelskik rzetelskik

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. area/dependency Issues or PRs related to dependency changes kind/machinery Categorizes issue or PR as related to Makefile, scripts or similar changes. lgtm Indicates that a PR is ready to be merged. priority/important-soon Must be staffed and worked on either currently, or very soon, ideally in time for the next release. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Support configuring ScyllaDB and Scylla Manager versions for e2e tests with flags
2 participants
@grzywin @rzetelskik