Skip to content

Commit cac1c22

Browse files
authored
Make use of the version defined in the api package instead of defining it again (#2400)
1 parent b0303cd commit cac1c22

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

e2e/test_operator_backups/operator_backup_test.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,9 @@ import (
3636
)
3737

3838
var (
39-
factory *fixtures.Factory
40-
fdbCluster *fixtures.FdbCluster
41-
testOptions *fixtures.FactoryOptions
42-
supportsEncryption fdbv1beta2.Version
39+
factory *fixtures.Factory
40+
fdbCluster *fixtures.FdbCluster
41+
testOptions *fixtures.FactoryOptions
4342
)
4443

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

66-
supportsEncryption, err = fdbv1beta2.ParseFdbVersion("7.4.6")
67-
Expect(err).NotTo(HaveOccurred())
68-
6965
// Create a blobstore for testing backups and restore.
7066
factory.CreateBlobstoreIfAbsent(factory.SingleNamespace())
7167
})
@@ -162,7 +158,8 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
162158

163159
When("encryption is enabled", func() {
164160
BeforeEach(func() {
165-
if !factory.GetFDBVersion().IsAtLeast(supportsEncryption) {
161+
if !factory.GetFDBVersion().
162+
IsAtLeast(fdbv1beta2.Versions.SupportsBackupEncryption) {
166163
Skip(
167164
"version doesn't support the encryption feature",
168165
)
@@ -209,7 +206,8 @@ var _ = Describe("Operator Backup", Label("e2e", "pr"), func() {
209206

210207
When("encryption is enabled", func() {
211208
BeforeEach(func() {
212-
if !factory.GetFDBVersion().IsAtLeast(supportsEncryption) {
209+
if !factory.GetFDBVersion().
210+
IsAtLeast(fdbv1beta2.Versions.SupportsBackupEncryption) {
213211
Skip(
214212
"version doesn't support the encryption feature",
215213
)

0 commit comments

Comments
 (0)