fix: clean up the release created by the test (konflux-ci#1217)

* fix: expect EC check not to fail (konflux-ci#1197) Instead of looking at "SUCCESS" as the result we can look at the result not being a "FAILURE", this way we can tolerate warnings as well. Resolves: https://issues.redhat.com/browse/KFLUXBUGS-1314 * fix: clean up release after the test is finished Signed-off-by: Jing Qi <[email protected]> clean up the random release version created in the test. --------- Co-authored-by: Zoran Regvart <[email protected]>
johnbieren · Jun 11, 2024 · c7eaad7 · c7eaad7
1 parent e979a06
commit c7eaad7
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/tests/release/pipelines/release_to_github.go b/tests/release/pipelines/release_to_github.go
@@ -30,7 +30,6 @@ import (
 const (
 	sampServiceAccountName = "release-service-account"
 	sampSourceGitURL       = "https://github.com/redhat-appstudio-qe/devfile-sample-go-basic"
-	sampReleaseURL         = "https://github.com/redhat-appstudio-qe/devfile-sample-go-basic/releases/tag/v2.1"
 	sampRepoOwner          = "redhat-appstudio-qe"
 	sampRepo               = "devfile-sample-go-basic"
 	sampCatalogPathInRepo  = "pipelines/release-to-github/release-to-github.yaml"
@@ -58,6 +57,7 @@ var _ = framework.ReleasePipelinesSuiteDescribe("e2e tests for release-to-github
 	var releaseCR *releaseapi.Release
 	var releasePR, buildPR *tektonv1.PipelineRun
 	var gh *github.Github
+	var sampReleaseURL string
 
 	AfterEach(framework.ReportFailure(&devFw))
 
@@ -78,11 +78,6 @@ var _ = framework.ReleasePipelinesSuiteDescribe("e2e tests for release-to-github
 			gh, err = github.NewGithubClient(githubToken, githubUser)
 			Expect(githubToken).ToNot(BeEmpty())
 
-			// Remove the release if the release exists
-			if gh.CheckIfReleaseExist(sampRepoOwner, sampRepo, sampReleaseURL) {
-				gh.DeleteRelease(sampRepoOwner, sampRepo, sampReleaseURL)
-			}
-
 			_, err = managedFw.AsKubeAdmin.CommonController.GetSecret(managedNamespace, releasecommon.RedhatAppstudioQESecret)
 			if errors.IsNotFound(err) {
 				githubSecret := &corev1.Secret{
@@ -122,6 +117,10 @@ var _ = framework.ReleasePipelinesSuiteDescribe("e2e tests for release-to-github
 			Expect(devFw.AsKubeDeveloper.HasController.DeleteApplication(sampApplicationName, devNamespace, false)).NotTo(HaveOccurred())
 			Expect(managedFw.AsKubeDeveloper.TektonController.DeleteEnterpriseContractPolicy(sampEnterpriseContractPolicyName, managedNamespace, false)).NotTo(HaveOccurred())
 			Expect(managedFw.AsKubeDeveloper.ReleaseController.DeleteReleasePlanAdmission(sampReleasePlanAdmissionName, managedNamespace, false)).NotTo(HaveOccurred())
+
+			if gh.CheckIfReleaseExist(sampRepoOwner, sampRepo, sampReleaseURL) {
+				gh.DeleteRelease(sampRepoOwner, sampRepo, sampReleaseURL)
+			}
 		})
 
 		var _ = Describe("Post-release verification", func() {
@@ -197,6 +196,7 @@ var _ = framework.ReleasePipelinesSuiteDescribe("e2e tests for release-to-github
 				trReleaseURL := trReleasePr.Status.TaskRunStatusFields.Results[0].Value.StringVal
 				releaseURL := strings.Replace(trReleaseURL, "\n", "", -1)
 				Expect(gh.CheckIfReleaseExist(sampRepoOwner, sampRepo, releaseURL)).To(BeTrue(), fmt.Sprintf("release %s doesn't exist", releaseURL))
+				sampReleaseURL = releaseURL
 			})
 		})
 	})