Fix e2e tests

Signed-off-by: Rendre Greyling <rendre.greyling@nokia.com>

Author: rendre-greyling

deployments/porch/9-controllers.yaml

@@ -51,6 +51,7 @@ spec:
         imagePullPolicy: IfNotPresent
         args:
         - --repositories.cache-type=DB
+        - --repositories.push-drafts-to-git=false
         - --repositories.create-v1alpha2-rpkg=false
         securityContext:
           runAsNonRoot: true

scripts/create-deployment-blueprint.sh

@@ -42,7 +42,7 @@ Supported Flags:
   --ghcr-image-prefix PREFIX          ... GHCR image url prefix for running porch behind a proxy
   --fn-runner-warm-up-pod-cache BOOL  ... disable warm-up-pod-cache in function runner
   --porch-cache-type TYPE             ... porch cache type (CR or DB)
-  --db-push-drafts-to-git BOOL        ... enable db-push-drafts-to-git flag for porch-server
+  --db-push-drafts-to-git BOOL        ... enable draft push flags for porch-server and porch-controllers
   --create-v1alpha2-rpkg BOOL         ... enable v1alpha2 PackageRevision CRD creation by repo controller
 EOF
   exit 1
@@ -246,6 +246,13 @@ function enable_db_push_drafts_to_git() {
       --match-name porch-server \
       --match-namespace porch-system \
       -- by-value="--db-push-drafts-to-git=false" put-value="--db-push-drafts-to-git=true"
+
+    kpt fn eval ${DESTINATION} \
+      --image ${SEARCH_REPLACE_IMG} \
+      --match-kind Deployment \
+      --match-name porch-controllers \
+      --match-namespace porch-system \
+      -- by-value="--repositories.push-drafts-to-git=false" put-value="--repositories.push-drafts-to-git=true"
 }
 
 function enable_v1alpha2_packagerevisions() {

test/e2e/api/db_git_sync_test.go

@@ -15,12 +15,13 @@
 package api
 
 import (
+	"context"
 	"time"
 
 	porchapi "github.com/kptdev/porch/api/porch/v1alpha1"
-	configapi "github.com/kptdev/porch/api/porchconfig/v1alpha1"
 	suiteutils "github.com/kptdev/porch/test/e2e/suiteutils"
 	"k8s.io/apimachinery/pkg/types"
+	"k8s.io/apimachinery/pkg/util/wait"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -29,29 +30,29 @@ const (
 	dbGitSyncWaitTimeout = 60 * time.Second
 )
 
-func (t *PorchSuite) updatePRR(repoName string, prr *porchapi.PackageRevisionResources, resourceKeys ...string) {
+func (t *PorchSuite) updatePRR(_ string, prr *porchapi.PackageRevisionResources, resourceKeys ...string) {
+	t.T().Helper()
 	t.UpdateF(prr)
-	if t.UsingDBCache {
-		return
-	}
-	var repo configapi.Repository
-	t.GetF(client.ObjectKey{Namespace: t.Namespace, Name: repoName}, &repo)
-	if repo.Annotations[configapi.AnnotationKeyV1Alpha2Migration] != configapi.AnnotationValueMigrationEnabled {
-		return
-	}
+
 	prName := prr.Name
-	t.Require().Eventually(func() bool {
+	err := wait.PollUntilContextTimeout(t.GetContext(), time.Second, dbGitSyncWaitTimeout, true, func(ctx context.Context) (bool, error) {
 		var latest porchapi.PackageRevisionResources
-		if err := t.Reader.Get(t.GetContext(), client.ObjectKey{Namespace: t.Namespace, Name: prName}, &latest); err != nil {
-			return false
+		if err := t.Reader.Get(ctx, client.ObjectKey{Namespace: t.Namespace, Name: prName}, &latest); err != nil {
+			return false, nil
 		}
 		for _, key := range resourceKeys {
 			if _, ok := latest.Spec.Resources[key]; !ok {
-				return false
+				return false, nil
 			}
 		}
-		return t.CheckRenderError(&latest.Status.RenderStatus) == nil
-	}, dbGitSyncWaitTimeout, time.Second)
+		if err := t.CheckRenderError(&latest.Status.RenderStatus); err != nil {
+			return false, nil
+		}
+		return true, nil
+	})
+	if err != nil {
+		t.Fatalf("updatePRR: PRR %q did not reflect update (keys %v) within %v", prName, resourceKeys, dbGitSyncWaitTimeout)
+	}
 }
 
 func (t *PorchSuite) TestSyncDraftSurvivesSyncWhenInGit() {
@@ -469,7 +470,8 @@ data:
 	// repo is still archived.  This advances the external commit past
 	// lastPushedCommitTimestamp, satisfying extChanged = true.
 	t.SetGiteaRepoArchived(giteaRepo, false)
-	t.GiteaCommitFileToBranch(giteaRepo, branchName, gitFileKey,
+	gitFilePath := packageName + "/" + gitFileKey
+	t.GiteaCommitFileToBranch(giteaRepo, branchName, gitFilePath,
 		`apiVersion: v1
 kind: ConfigMap
 metadata:

test/e2e/suiteutils/gitea_test_utils.go

@@ -43,14 +43,6 @@ const (
 	defaultGiteaLBIP = "172.18.255.200"
 )
 
-// GetGiteaURL returns the appropriate Gitea URL based on whether Porch server is running in cluster
-func (t *TestSuite) GetGiteaURL() string {
-	if t.IsPorchServerInCluster() {
-		return t.GiteaUrl + "/" + t.GiteaUser + "/"
-	}
-	return "http://localhost:3000/porch/"
-}
-
 func (t *TestSuite) GetGiteaApiURL() string {
 	if t.GiteaUrl == GiteaClusterURL {
 		return "http://localhost:3000"
@@ -180,7 +172,7 @@ func (t *TestSuite) CreateGiteaRepoNoCleanup(repoName string) string {
 	}
 	t.Logf("CreateGiteaRepoNoCleanup: created repo %q", repoName)
 
-	return t.GetGiteaURL() + repoName + ".git"
+	return t.getGiteaURL() + repoName + ".git"
 }
 
 // DeleteGiteaRepo deletes a Gitea repository owned by t.GiteaUser.

test/e2e/suiteutils/suite_utils.go

@@ -799,55 +799,66 @@ func (t *TestSuite) GetPackageRevisionWithFilter(repo, pkgName string, filter Pa
 	return &prList.Items[0]
 }
 
-// TriggerRepoSync schedules a one-time sync for the given repository by setting
-// spec.sync.runOnceAt to now+7s, then waits for the sync to complete.
 func (t *TestSuite) TriggerRepoSync(repoName string, timeout time.Duration) {
 	t.T().Helper()
 	repoKey := client.ObjectKey{Namespace: t.Namespace, Name: repoName}
 
 	var repo configapi.Repository
 	t.GetF(repoKey, &repo)
 
+	baselineLastSync := time.Time{}
+	if repo.Status.LastFullSyncTime != nil {
+		baselineLastSync = repo.Status.LastFullSyncTime.Time
+	}
+
 	if repo.Spec.Sync == nil {
 		repo.Spec.Sync = &configapi.RepositorySync{}
 	}
-	// The handleRunOnceAt goroutine polls every 5s and requires time.Until(runOnceAt) > 0
-	// when it observes the change, so we add 8s of lead time to be safe.
-	repo.Spec.Sync.RunOnceAt = ptr.To(metav1.NewTime(time.Now().Add(8 * time.Second)))
+	// Schedule runOnceAt slightly in the past so the controller's isOneTimeSyncDue
+	// check triggers a full sync on the next reconcile without an extra delay.
+	runOnceAt := metav1.NewTime(time.Now().Add(-1 * time.Second))
+	repo.Spec.Sync.RunOnceAt = ptr.To(runOnceAt)
 	t.UpdateF(&repo)
 
 	t.Logf("TriggerRepoSync: set runOnceAt for repo %s, waiting for sync to complete", repoName)
-	t.WaitForNextRepoSync(repoName, timeout)
+	t.WaitForNextRepoSync(repoName, timeout, baselineLastSync, runOnceAt.Time)
 }
 
-// WaitForNextRepoSync waits until the Ready condition message changes, indicating a sync cycle completed.
-func (t *TestSuite) WaitForNextRepoSync(repoName string, timeout time.Duration) {
+func (t *TestSuite) WaitForNextRepoSync(repoName string, timeout time.Duration, baselineLastSync, triggeredRunOnceAt time.Time) {
 	t.T().Helper()
 	repoKey := client.ObjectKey{Namespace: t.Namespace, Name: repoName}
 
-	var repo configapi.Repository
-	t.GetF(repoKey, &repo)
-
-	currentMsg := ""
-	for _, cond := range repo.Status.Conditions {
-		if cond.Type == configapi.RepositoryReady {
-			currentMsg = cond.Message
-			break
-		}
-	}
-
-	t.Logf("WaitForNextRepoSync: waiting for repo %s condition to change from %q (timeout %v)", repoName, currentMsg, timeout)
+	t.Logf("WaitForNextRepoSync: waiting for repo %s full sync after LastFullSyncTime %v (timeout %v)",
+		repoName, baselineLastSync, timeout)
 	waitErr := wait.PollUntilContextTimeout(t.GetContext(), 1*time.Second, timeout, false, func(ctx context.Context) (bool, error) {
 		var latest configapi.Repository
 		if err := t.Reader.Get(ctx, repoKey, &latest); err != nil {
 			return false, err
 		}
+
+		ready := false
 		for _, cond := range latest.Status.Conditions {
-			if cond.Type == configapi.RepositoryReady && cond.Message != currentMsg {
-				t.Logf("WaitForNextRepoSync: repo %s sync completed (new message=%q)", repoName, cond.Message)
-				return true, nil
+			if cond.Type == configapi.RepositoryReady && cond.Status == metav1.ConditionTrue {
+				ready = true
+				break
 			}
 		}
+		if !ready {
+			return false, nil
+		}
+
+		if latest.Status.LastFullSyncTime != nil && latest.Status.LastFullSyncTime.Time.After(baselineLastSync) {
+			t.Logf("WaitForNextRepoSync: repo %s sync completed (LastFullSyncTime=%s)",
+				repoName, latest.Status.LastFullSyncTime.Time.Format(time.RFC3339))
+			return true, nil
+		}
+
+		if latest.Status.ObservedRunOnceAt != nil && latest.Status.ObservedRunOnceAt.Time.Equal(triggeredRunOnceAt) {
+			t.Logf("WaitForNextRepoSync: repo %s runOnceAt sync completed (ObservedRunOnceAt=%s)",
+				repoName, latest.Status.ObservedRunOnceAt.Time.Format(time.RFC3339))
+			return true, nil
+		}
+
 		return false, nil
 	})