Skip to content

Make use of the version defined in the api package instead of defining it again #2400

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

Merged
johscheuer merged 1 commit into from
Dec 3, 2025
Merged

Make use of the version defined in the api package instead of defining it again #2400

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions e2e/test_operator_backups/operator_backup_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,9 @@ import (
)

var (
factory *fixtures.Factory
fdbCluster *fixtures.FdbCluster
testOptions *fixtures.FactoryOptions
supportsEncryption fdbv1beta2.Version
factory *fixtures.Factory
fdbCluster *fixtures.FdbCluster
testOptions *fixtures.FactoryOptions
)

func init() {
Expand All @@ -63,9 +62,6 @@ var _ = BeforeSuite(func() {
Skip("Skip backup tests with 7.1.63 as this version has a bug in the fdbbackup agent")
}

supportsEncryption, err = fdbv1beta2.ParseFdbVersion("7.4.6")
Expect(err).NotTo(HaveOccurred())

// Create a blobstore for testing backups and restore.
factory.CreateBlobstoreIfAbsent(factory.SingleNamespace())
})
Expand Down Expand Up @@ -162,7 +158,8 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {

When("encryption is enabled", func() {
BeforeEach(func() {
if !factory.GetFDBVersion().IsAtLeast(supportsEncryption) {
if !factory.GetFDBVersion().
IsAtLeast(fdbv1beta2.Versions.SupportsBackupEncryption) {
Skip(
"version doesn't support the encryption feature",
)
Expand Down Expand Up @@ -209,7 +206,8 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {

When("encryption is enabled", func() {
BeforeEach(func() {
if !factory.GetFDBVersion().IsAtLeast(supportsEncryption) {
if !factory.GetFDBVersion().
IsAtLeast(fdbv1beta2.Versions.SupportsBackupEncryption) {
Skip(
"version doesn't support the encryption feature",
)
Expand Down