fix(KONFLUX-5718): fix afterall to close merge request even it failed (…

…#1490) Signed-off-by: Kasem Alem <[email protected]> Co-authored-by: Kasem Alem <[email protected]>
konflux-ci · Jan 29, 2025 · 118ccac · 118ccac
1 parent 3116e43
commit 118ccac
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/tests/integration-service/gitlab-integration-reporting.go b/tests/integration-service/gitlab-integration-reporting.go
@@ -81,15 +81,17 @@ var _ = framework.IntegrationServiceSuiteDescribe("Gitlab Status Reporting of In
 		})
 
 		AfterAll(func() {
-			if !CurrentSpecReport().Failed() {
-				Expect(f.AsKubeAdmin.HasController.DeleteApplication(applicationName, testNamespace, false)).To(Succeed())
-				Expect(f.SandboxController.DeleteUserSignup(f.UserName)).To(BeTrue())
-			}
 
 			// Cleanup test: close MR if opened, delete created branch, delete associated Webhooks
 			Expect(f.AsKubeAdmin.CommonController.Gitlab.CloseMergeRequest(projectID, mrID)).NotTo(HaveOccurred())
 			Expect(f.AsKubeAdmin.CommonController.Gitlab.DeleteBranch(projectID, componentBaseBranchName)).NotTo(HaveOccurred())
 			Expect(f.AsKubeAdmin.CommonController.Gitlab.DeleteWebhooks(projectID, f.ClusterAppDomain)).NotTo(HaveOccurred())
+
+			if !CurrentSpecReport().Failed() {
+				Expect(f.AsKubeAdmin.HasController.DeleteApplication(applicationName, testNamespace, false)).To(Succeed())
+				Expect(f.SandboxController.DeleteUserSignup(f.UserName)).To(BeTrue())
+			}
+
 		})
 
 		When("a new Component with specified custom branch is created", Label("custom-branch"), func() {