diff --git a/tests/release/pipelines/push_to_external_registry.go b/tests/release/pipelines/push_to_external_registry.go index d644a1600c..89d4bf8025 100644 --- a/tests/release/pipelines/push_to_external_registry.go +++ b/tests/release/pipelines/push_to_external_registry.go @@ -49,8 +49,6 @@ var _ = framework.ReleasePipelinesSuiteDescribe("Push to external registry", Lab managedServiceAccount, err := fw.AsKubeAdmin.CommonController.CreateServiceAccount(releasecommon.ReleasePipelineServiceAccountDefault, managedNamespace, releasecommon.ManagednamespaceSecret, nil) Expect(err).NotTo(HaveOccurred()) - _, err = fw.AsKubeAdmin.ReleaseController.CreateReleasePipelineRoleBindingForServiceAccount(devNamespace, managedServiceAccount) - Expect(err).NotTo(HaveOccurred()) _, err = fw.AsKubeAdmin.ReleaseController.CreateReleasePipelineRoleBindingForServiceAccount(managedNamespace, managedServiceAccount) Expect(err).NotTo(HaveOccurred()) @@ -84,7 +82,7 @@ var _ = framework.ReleasePipelinesSuiteDescribe("Push to external registry", Lab "mapping": map[string]interface{}{ "components": []map[string]interface{}{ { - "name": component.GetName(), + "name": component.GetName(), "repository": releasecommon.ReleasedImagePushRepo, }, }, @@ -168,15 +166,15 @@ var _ = framework.ReleasePipelinesSuiteDescribe("Push to external registry", Lab }) It("tests if the image was pushed to quay", func() { - //retrieve the component to get the latest data + //retrieve the component to get the latest data component, err := fw.AsKubeAdmin.HasController.GetComponent(component.GetName(), devNamespace) Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("could not get component %s in the %s namespace", component.GetName(), devNamespace)) containerImageDigest := strings.Split(component.Spec.ContainerImage, "@")[1] imageDigest, err := releasecommon.GetDigestWithTagInQuay(releasecommon.ReleasedImagePushRepo + ":latest") - Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("failed while getting Digest for quay image %s with error: %+v", releasecommon.ReleasedImagePushRepo + ":latest", err)) + Expect(err).ShouldNot(HaveOccurred(), fmt.Sprintf("failed while getting Digest for quay image %s with error: %+v", releasecommon.ReleasedImagePushRepo+":latest", err)) Expect(imageDigest).To(Equal(containerImageDigest)) - }) + }) It("verifies that a Release is marked as succeeded.", func() { Eventually(func() error { diff --git a/tests/release/pipelines/rh_push_to_external_registry.go b/tests/release/pipelines/rh_push_to_external_registry.go index 92ef0d5c28..a4d3d0909d 100644 --- a/tests/release/pipelines/rh_push_to_external_registry.go +++ b/tests/release/pipelines/rh_push_to_external_registry.go @@ -111,8 +111,6 @@ var _ = framework.ReleasePipelinesSuiteDescribe("[HACBS-1571]test-release-e2e-pu managedServiceAccount, err := fw.AsKubeAdmin.CommonController.CreateServiceAccount(releaseConst.ReleasePipelineServiceAccountDefault, managedNamespace, releaseConst.ManagednamespaceSecret, nil) Expect(err).NotTo(HaveOccurred()) - _, err = fw.AsKubeAdmin.ReleaseController.CreateReleasePipelineRoleBindingForServiceAccount(devNamespace, managedServiceAccount) - Expect(err).NotTo(HaveOccurred()) _, err = fw.AsKubeAdmin.ReleaseController.CreateReleasePipelineRoleBindingForServiceAccount(managedNamespace, managedServiceAccount) Expect(err).NotTo(HaveOccurred()) diff --git a/tests/release/service/happy_path.go b/tests/release/service/happy_path.go index bc7ea2ee55..2ad752fe4e 100644 --- a/tests/release/service/happy_path.go +++ b/tests/release/service/happy_path.go @@ -51,8 +51,6 @@ var _ = framework.ReleaseServiceSuiteDescribe("Release service happy path", Labe managedServiceAccount, err := fw.AsKubeAdmin.CommonController.CreateServiceAccount(releaseConst.ReleasePipelineServiceAccountDefault, managedNamespace, releaseConst.ManagednamespaceSecret, nil) Expect(err).NotTo(HaveOccurred()) - _, err = fw.AsKubeAdmin.ReleaseController.CreateReleasePipelineRoleBindingForServiceAccount(devNamespace, managedServiceAccount) - Expect(err).NotTo(HaveOccurred()) _, err = fw.AsKubeAdmin.ReleaseController.CreateReleasePipelineRoleBindingForServiceAccount(managedNamespace, managedServiceAccount) Expect(err).NotTo(HaveOccurred()) diff --git a/tests/release/service/happy_path_with_deployment.go b/tests/release/service/happy_path_with_deployment.go index e0784c8a1d..6fc8e544dd 100644 --- a/tests/release/service/happy_path_with_deployment.go +++ b/tests/release/service/happy_path_with_deployment.go @@ -101,8 +101,6 @@ var _ = framework.ReleaseServiceSuiteDescribe("happy_path_with_deployment", Labe managedServiceAccount, err := fw.AsKubeAdmin.CommonController.CreateServiceAccount(releaseConst.ReleasePipelineServiceAccountDefault, managedNamespace, releaseConst.ManagednamespaceSecret, nil) Expect(err).NotTo(HaveOccurred()) - _, err = fw.AsKubeAdmin.ReleaseController.CreateReleasePipelineRoleBindingForServiceAccount(devNamespace, managedServiceAccount) - Expect(err).NotTo(HaveOccurred()) _, err = fw.AsKubeAdmin.ReleaseController.CreateReleasePipelineRoleBindingForServiceAccount(managedNamespace, managedServiceAccount) Expect(err).NotTo(HaveOccurred())