File tree 2 files changed +4
-8
lines changed
2 files changed +4
-8
lines changed Original file line number Diff line number Diff line change 1
1
package upgrade
2
2
3
3
import (
4
- pkgupgrade "knative.dev/pkg/test/upgrade"
5
- "knative.dev/reconciler-test/pkg/environment"
6
-
7
4
"github.com/openshift-knative/serverless-operator/test"
8
5
"github.com/openshift-knative/serverless-operator/test/upgrade/installation"
6
+ pkgupgrade "knative.dev/pkg/test/upgrade"
9
7
)
10
8
11
9
func ServerlessUpgradeOperations (ctx * test.Context ) []pkgupgrade.Operation {
@@ -18,14 +16,12 @@ func ServerlessUpgradeOperations(ctx *test.Context) []pkgupgrade.Operation {
18
16
}
19
17
}
20
18
21
- func ServerlessDowngradeOperations (ctx * test.Context , glob environment. GlobalEnvironment ) []pkgupgrade.Operation {
19
+ func ServerlessDowngradeOperations (ctx * test.Context ) []pkgupgrade.Operation {
22
20
return []pkgupgrade.Operation {
23
21
pkgupgrade .NewOperation ("DowngradeServerless" , func (c pkgupgrade.Context ) {
24
22
if err := installation .DowngradeServerless (ctx ); err != nil {
25
23
c .T .Error ("Serverless downgrade failed:" , err )
26
24
}
27
- installation .CleanupChannelv2ConsumerGroups (c , glob )
28
- installation .CleanupChannelv2Deployments (c , glob )
29
25
}),
30
26
}
31
27
}
Original file line number Diff line number Diff line change @@ -75,7 +75,7 @@ func TestServerlessUpgradePrePost(t *testing.T) {
75
75
},
76
76
Installations : pkgupgrade.Installations {
77
77
UpgradeWith : upgrade .ServerlessUpgradeOperations (ctx ),
78
- DowngradeWith : upgrade .ServerlessDowngradeOperations (ctx , global ),
78
+ DowngradeWith : upgrade .ServerlessDowngradeOperations (ctx ),
79
79
},
80
80
}
81
81
suite .Execute (pkgupgrade.Configuration {T : t })
@@ -97,7 +97,7 @@ func TestServerlessUpgradeContinual(t *testing.T) {
97
97
},
98
98
Installations : pkgupgrade.Installations {
99
99
UpgradeWith : upgrade .ServerlessUpgradeOperations (ctx ),
100
- DowngradeWith : upgrade .ServerlessDowngradeOperations (ctx , global ),
100
+ DowngradeWith : upgrade .ServerlessDowngradeOperations (ctx ),
101
101
},
102
102
}
103
103
suite .Execute (pkgupgrade.Configuration {T : t })
You can’t perform that action at this time.
0 commit comments