@@ -35,6 +35,11 @@ import (
35
35
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
36
36
)
37
37
38
+ const (
39
+ openshiftregistryFQDN = "image-registry.openshift-image-registry.svc:5000"
40
+ catsrcImage = "docker://quay.io/olmtest/catsrc-update-test:"
41
+ )
42
+
38
43
var _ = Describe ("Catalog represents a store of bundles which OLM can use to install Operators" , func () {
39
44
var (
40
45
c operatorclient.ClientInterface
@@ -694,7 +699,7 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
694
699
err = registryPortForward (ns .GetName ())
695
700
Expect (err ).NotTo (HaveOccurred (), "port-forwarding local registry: %s" , err )
696
701
} else {
697
- registryURL = openshiftregistryFQDN
702
+ registryURL = fmt . Sprintf ( "%s/%s" , openshiftregistryFQDN , ns . GetName ())
698
703
registryAuth , err = openshiftRegistryAuth (c , ns .GetName ())
699
704
Expect (err ).NotTo (HaveOccurred (), "error getting openshift registry authentication: %s" , err )
700
705
}
@@ -1155,11 +1160,6 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
1155
1160
})
1156
1161
})
1157
1162
1158
- const (
1159
- openshiftregistryFQDN = "image-registry.openshift-image-registry.svc:5000/openshift-operators"
1160
- catsrcImage = "docker://quay.io/olmtest/catsrc-update-test:"
1161
- )
1162
-
1163
1163
func getOperatorDeployment (c operatorclient.ClientInterface , namespace string , operatorLabels labels.Set ) (* appsv1.Deployment , error ) {
1164
1164
deployments , err := c .ListDeploymentsWithLabels (namespace , operatorLabels )
1165
1165
if err != nil || deployments == nil || len (deployments .Items ) != 1 {
0 commit comments