Checking Gitrepository resource for the app

Author: saeedfazal

.github/workflows/test.yaml

@@ -377,8 +377,7 @@ jobs:
     - name: Download gitops binary from s3
       run: |
         mkdir -p cmd/gitops/
-        # wget https://weave-gitops.s3.us-east-2.amazonaws.com/gitops-ubuntu-latest
-        curl -L "https://github.com/weaveworks/weave-gitops/releases/download/v0.4.1/gitops-$(uname)-$(uname -m)" -o gitops-ubuntu-latest
+        wget https://weave-gitops.s3.us-east-2.amazonaws.com/gitops-ubuntu-latest
         mv gitops-ubuntu-latest $GITOPS_BIN_PATH
     - name: Change bin permissions
       run: |

test/acceptance/test/cli_upgrade.go

@@ -156,7 +156,7 @@ func DescribeCliUpgrade(gitopsTestRunner GitopsTestRunner) {
 
 						return out != ""
 					}
-					Eventually(repoExists, ASSERTION_2MINUTE_TIME_OUT, POLL_INTERVAL_5SECONDS).Should(BeTrue(), fmt.Sprintf("%s/%s Gitrepository does not exist in the cluster", GITOPS_DEFAULT_NAMESPACE, appName))
+					Eventually(repoExists, ASSERTION_2MINUTE_TIME_OUT, POLL_INTERVAL_5SECONDS).Should(BeTrue(), fmt.Sprintf("%s/%s Gitrepository resource does not exist in the cluster", GITOPS_DEFAULT_NAMESPACE, appName))
 
 				})
 

test/acceptance/test/pages/applications.go

@@ -44,15 +44,7 @@ func (a ApplicationDetails) WaitForPageToLoad(webDriver *agouti.Page) {
 // This function waits for main application page to be rendered
 func (a ApplicationPage) WaitForPageToLoad(webDriver *agouti.Page, appCount int) {
 	Eventually(a.ApplicationCount).Should(BeVisible())
-
-	isLoaded := func() bool {
-		_ = webDriver.Refresh()
-		if aCnt, _ := a.ApplicationCount.Text(); aCnt >= strconv.Itoa(appCount) {
-			return true
-		}
-		return false
-	}
-	Eventually(isLoaded, 2*time.Minute, 5*time.Second).Should(BeTrue(), "Application page failed to load/render as expected")
+	Eventually(a.ApplicationCount, 30*time.Second).Should(MatchText(strconv.Itoa(appCount)), "Application page failed to load/render as expected")
 }
 
 func GetApplicationPage(webDriver *agouti.Page) *ApplicationPage {

test/acceptance/test/ui_applications.go

@@ -86,6 +86,17 @@ func DescribeApplications(gitopsTestRunner GitopsTestRunner) {
 					Expect(string(session.Err.Contents())).Should(BeEmpty())
 				})
 
+				By(fmt.Sprintf("And wait for %s/%s GitRepository resource to be available in cluster", GITOPS_DEFAULT_NAMESPACE, appName), func() {
+					repoExists := func() bool {
+						cmd := fmt.Sprintf(`kubectl get GitRepository %s -n %s`, appName, GITOPS_DEFAULT_NAMESPACE)
+						out, _ := runCommandAndReturnStringOutput(cmd)
+
+						return out != ""
+					}
+					Eventually(repoExists, ASSERTION_2MINUTE_TIME_OUT, POLL_INTERVAL_5SECONDS).Should(BeTrue(), fmt.Sprintf("%s/%s Gitrepository resource does not exist in the cluster", GITOPS_DEFAULT_NAMESPACE, appName))
+
+				})
+
 				pages.NavigateToPage(webDriver, "Applications")
 				applicationsPage := pages.GetApplicationPage(webDriver)
 
@@ -106,26 +117,26 @@ func DescribeApplications(gitopsTestRunner GitopsTestRunner) {
 				By(fmt.Sprintf(`Then %s details should be rendered`, appName), func() {
 					appDetails.WaitForPageToLoad(webDriver)
 
-					Expect(appDetails.Name).Should(MatchText(appName))
-					Expect(appDetails.DeploymentType).Should(MatchText("Kustomize"))
-					Expect(appDetails.URL).Should(MatchText(fmt.Sprintf(`ssh://git.+%s/%s.+`, GITHUB_ORG, CLUSTER_REPOSITORY)))
-					Expect(appDetails.Path).Should(MatchText(appPath))
+					Eventually(appDetails.Name).Should(MatchText(appName))
+					Eventually(appDetails.DeploymentType).Should(MatchText("Kustomize"))
+					Eventually(appDetails.URL).Should(MatchText(fmt.Sprintf(`ssh://git.+%s/%s.+`, GITHUB_ORG, CLUSTER_REPOSITORY)))
+					Eventually(appDetails.Path).Should(MatchText(appPath))
 				})
 
 				By(fmt.Sprintf(`And %s source/git status is available`, appName), func() {
 					sourceCondition := pages.GetApplicationConditions(webDriver, "Source Conditions")
-					Expect(sourceCondition.Type).Should(MatchText("Ready"))
-					Expect(sourceCondition.Status).Should(MatchText("True"))
-					Expect(sourceCondition.Reason).Should(MatchText("GitOperationSucceed"))
-					Expect(sourceCondition.Message).Should(MatchText(`Fetched revision: main/[\w\d].+`))
+					Eventually(sourceCondition.Type).Should(MatchText("Ready"))
+					Eventually(sourceCondition.Status).Should(MatchText("True"))
+					Eventually(sourceCondition.Reason).Should(MatchText("GitOperationSucceed"))
+					Eventually(sourceCondition.Message).Should(MatchText(`Fetched revision: main/[\w\d].+`))
 				})
 
 				By(fmt.Sprintf(`And %s automation/kustomization status is available`, appName), func() {
 					sourceCondition := pages.GetApplicationConditions(webDriver, "Automation Conditions")
-					Expect(sourceCondition.Type).Should(MatchText("Ready"))
-					Expect(sourceCondition.Status).Should(MatchText("True"))
-					Expect(sourceCondition.Reason).Should(MatchText("ReconciliationSucceeded"))
-					Expect(sourceCondition.Message).Should(MatchText(`Applied revision: main/[\w\d].+`))
+					Eventually(sourceCondition.Type).Should(MatchText("Ready"))
+					Eventually(sourceCondition.Status, ASSERTION_1MINUTE_TIME_OUT, POLL_INTERVAL_5SECONDS).Should(MatchText("True"))
+					Eventually(sourceCondition.Reason).Should(MatchText("ReconciliationSucceeded"))
+					Eventually(sourceCondition.Message).Should(MatchText(`Applied revision: main/[\w\d].+`))
 				})
 			})
 		})