Merge remote-tracking branch 'upstream/main' into feat/bitbucket-scm

Signed-off-by: Ushira Dineth <[email protected]>

Author: ushiradineth

go.mod

@@ -23,14 +23,14 @@ require (
 	github.com/spf13/pflag v1.0.10
 	github.com/stretchr/testify v1.11.1
 	github.com/tidwall/gjson v1.18.0
-	gitlab.com/gitlab-org/api/client-go v0.159.0
+	gitlab.com/gitlab-org/api/client-go v0.160.0
 	go.uber.org/zap v1.27.0
 	golang.org/x/sync v0.18.0
 	golang.org/x/time v0.14.0
 	gopkg.in/yaml.v3 v3.0.1
-	k8s.io/api v0.34.1
-	k8s.io/apimachinery v0.34.1
-	k8s.io/client-go v0.34.1
+	k8s.io/api v0.34.2
+	k8s.io/apimachinery v0.34.2
+	k8s.io/client-go v0.34.2
 	k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
 	sigs.k8s.io/controller-runtime v0.22.4
 	sigs.k8s.io/multicluster-runtime v0.22.0-beta.0

go.sum

@@ -857,12 +857,41 @@ var _ = Describe("PromotionStrategy Controller", func() {
 			Expect(conflictingSha).NotTo(BeEmpty())
 
 			By("Checking that there is no previous-environment commit status created, since no active checks are configured")
+			// List all CTPs owned by this test's PromotionStrategy
+			ctpList := promoterv1alpha1.ChangeTransferPolicyList{}
+			err = k8sClient.List(ctx, &ctpList, client.InNamespace(typeNamespacedName.Namespace))
+			Expect(err).NotTo(HaveOccurred())
+
+			// Build a set of CTP UIDs that belong to this test's PromotionStrategy, so that we can continue to run tests
+			// in parallel without interfering with each other.
+			ctpUIDs := make(map[string]bool)
+			for _, ctp := range ctpList.Items {
+				for _, ownerRef := range ctp.OwnerReferences {
+					if ownerRef.Name == promotionStrategy.Name && ownerRef.UID == promotionStrategy.UID {
+						ctpUIDs[string(ctp.UID)] = true
+						break
+					}
+				}
+			}
+
+			// List all previous-environment commit statuses and filter by ownership
 			csList := promoterv1alpha1.CommitStatusList{}
 			err = k8sClient.List(ctx, &csList, client.MatchingLabels{
 				promoterv1alpha1.CommitStatusLabel: promoterv1alpha1.PreviousEnvironmentCommitStatusKey,
 			})
 			Expect(err).NotTo(HaveOccurred())
-			Expect(len(csList.Items)).To(Equal(0))
+
+			// Filter to only include commit statuses owned by this test's CTPs
+			testCommitStatuses := 0
+			for _, cs := range csList.Items {
+				for _, ownerRef := range cs.OwnerReferences {
+					if ctpUIDs[string(ownerRef.UID)] {
+						testCommitStatuses++
+						break
+					}
+				}
+			}
+			Expect(testCommitStatuses).To(Equal(0))
 
 			By("Waiting for CTPs to reconcile after the conflict and verifying conflict resolution")
 			Eventually(func(g Gomega) {

internal/controller/promotionstrategy_controller_test.go

@@ -11,7 +11,7 @@
   "dependencies": {
     "@types/js-yaml": "^4.0.9",
     "ace-builds": "^1.43.2",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "react": "18.3.1",
     "react-ace": "^14.0.1",
     "react-dom": "18.3.1",

ui/components-lib/package-lock.json

@@ -34,7 +34,7 @@
   "dependencies": {
     "@types/js-yaml": "^4.0.9",
     "axios": "^1.12.0",
-    "js-yaml": "^4.1.0",
+    "js-yaml": "^4.1.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
     "zustand": "^3.7.2"