Skip to content

Commit c970cc6

Browse files
committed
e2e: Fix authentication issue when connecting to the OCP image registry
Signed-off-by: timflannagan <[email protected]>
1 parent 3604159 commit c970cc6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

test/e2e/catalog_e2e_test.go

+6-6
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ import (
3535
"github.com/operator-framework/operator-lifecycle-manager/test/e2e/ctx"
3636
)
3737

38+
const (
39+
openshiftregistryFQDN = "image-registry.openshift-image-registry.svc:5000"
40+
catsrcImage = "docker://quay.io/olmtest/catsrc-update-test:"
41+
)
42+
3843
var _ = Describe("Catalog represents a store of bundles which OLM can use to install Operators", func() {
3944
var (
4045
c operatorclient.ClientInterface
@@ -694,7 +699,7 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
694699
err = registryPortForward(ns.GetName())
695700
Expect(err).NotTo(HaveOccurred(), "port-forwarding local registry: %s", err)
696701
} else {
697-
registryURL = openshiftregistryFQDN
702+
registryURL = fmt.Sprintf("%s/%s", openshiftregistryFQDN, ns.GetName())
698703
registryAuth, err = openshiftRegistryAuth(c, ns.GetName())
699704
Expect(err).NotTo(HaveOccurred(), "error getting openshift registry authentication: %s", err)
700705
}
@@ -1155,11 +1160,6 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
11551160
})
11561161
})
11571162

1158-
const (
1159-
openshiftregistryFQDN = "image-registry.openshift-image-registry.svc:5000/openshift-operators"
1160-
catsrcImage = "docker://quay.io/olmtest/catsrc-update-test:"
1161-
)
1162-
11631163
func getOperatorDeployment(c operatorclient.ClientInterface, namespace string, operatorLabels labels.Set) (*appsv1.Deployment, error) {
11641164
deployments, err := c.ListDeploymentsWithLabels(namespace, operatorLabels)
11651165
if err != nil || deployments == nil || len(deployments.Items) != 1 {

0 commit comments

Comments
 (0)