Merge branch 'master' into update_go_version

Author: rsoaresd

build/devsandbox-dashboard/Dockerfile

@@ -51,8 +51,6 @@ WORKDIR /app
 # Increase shared memory for browsers (recommended for Playwright)
 RUN mkdir -p /dev/shm && chmod 1777 /dev/shm
 
-COPY . .
-
 # Install Firefox required dependencies
 RUN yum install -y \
         libxcb \
@@ -76,4 +74,6 @@ RUN yum install -y \
         libX11-xcb && \
     yum clean all
 
+COPY . .
+
 CMD ["/bin/bash"]

go.mod

@@ -145,3 +145,5 @@ require (
 go 1.24.4
 
 toolchain go1.24.13
+
+tool github.com/playwright-community/playwright-go/cmd/playwright

make/devsandbox-dashboard.mk

@@ -32,11 +32,8 @@ endif
 e2e-run-devsandbox-dashboard: HOST_NS=$(shell oc get projects -l app=host-operator --output=name -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' | sort | tail -n 1)
 e2e-run-devsandbox-dashboard: RHDH=https://rhdh-${DEVSANDBOX_DASHBOARD_NS}.$(shell oc get ingress.config.openshift.io/cluster -o jsonpath='{.spec.domain}')
 e2e-run-devsandbox-dashboard:
-	$(eval PWGO_VER := $(shell grep -oE "playwright-go v\S+" go.mod | sed 's/playwright-go //g'))
-	@echo "Installing Playwright CLI version: $(PWGO_VER)"
-	go install github.com/playwright-community/playwright-go/cmd/playwright@$(PWGO_VER)
 	@echo "Installing Firefox browser for Playwright..."
-	$(GOPATH)/bin/playwright install firefox
+	go tool playwright install firefox
 
 	@echo "Running Developer Sandbox Dashboard setup e2e tests..."
 	DEVSANDBOX_DASHBOARD_NS=${DEVSANDBOX_DASHBOARD_NS} go test "./test/e2e/devsandbox-dashboard/setup" -v -timeout=10m -failfast

test/e2e/parallel/registration_service_test.go

@@ -854,6 +854,11 @@ func TestActivationCodeVerification(t *testing.T) {
 			event := testsocialevent.NewSocialEvent(hostAwait.Namespace, commonsocialevent.NewName(),
 				testsocialevent.WithUserTier("deactivate80"),
 				testsocialevent.WithSpaceTier("base1ns6didler"),
+				// MaxAttendees is set to 0 to simulate event being already full
+				// We use this approach instead of manipulating ActivationCount to avoid flakiness
+				// if the controller reconciliation is triggered by other parallel test, the ActivationCount
+				// would be recalculated to 0 (due to the counting of approved UserSignups) and the test would fail.
+				testsocialevent.WithMaxAttendees(0),
 				testsocialevent.WithTargetCluster(member2Await.ClusterName))
 			err := hostAwait.CreateWithCleanup(t, event)
 			require.NoError(t, err)
@@ -862,12 +867,6 @@ func TestActivationCodeVerification(t *testing.T) {
 				Status: corev1.ConditionTrue,
 			})) // need to reload event
 			require.NoError(t, err)
-			event, err = wait.For(t, hostAwait.Awaitility, &toolchainv1alpha1.SocialEvent{}).
-				UpdateStatus(event.Name, hostAwait.Namespace,
-					func(ev *toolchainv1alpha1.SocialEvent) {
-						ev.Status.ActivationCount = event.Spec.MaxAttendees // activation count identical to `MaxAttendees`
-					})
-			require.NoError(t, err)
 
 			userSignup, token := signup(t, hostAwait)
 

test/e2e/parallel/user_workloads_test.go

@@ -111,6 +111,10 @@ func TestIdlerAndPriorityClass(t *testing.T) {
 	// Wait for the DataVolume to be deleted
 	err = memberAwait.WaitUntilDataVolumeDeleted(t, "test-idler-datavolume", idler.Name, clnt.Resource(dataVolumeRes))
 	require.NoError(t, err)
+
+	// Wait for the PVC to be deleted
+	err = memberAwait.WaitUntilPVCDeleted(t, "test-idler-pvc", idler.Name)
+	require.NoError(t, err)
 }
 
 func prepareIdlerUser(t *testing.T, await wait.Awaitilities, name string) (*toolchainv1alpha1.Idler, *toolchainv1alpha1.Idler) {
@@ -170,6 +174,10 @@ func prepareWorkloads(t *testing.T, memberAwait *wait.MemberAwaitility, namespac
 	createDataVolume(t, memberAwait, "test-idler-datavolume", namespace)
 	n = n + 1
 
+	// Create a PVC and Pod
+	createPvcWithPod(t, memberAwait, "test-idler-pvc", namespace, nil)
+	n = n + 1
+
 	servingRuntimeDeployment := createKServeWorkloads(t, memberAwait, "test-idler-kserve", namespace)
 	n = n + int(*servingRuntimeDeployment.Spec.Replicas)
 

testsupport/wait/member.go

@@ -1573,6 +1573,27 @@ func (a *MemberAwaitility) WaitUntilDataVolumeDeleted(t *testing.T, name, namesp
 	return err
 }
 
+// WaitUntilPVCDeleted waits for the PVC resource to be deleted (idled)
+func (a *MemberAwaitility) WaitUntilPVCDeleted(t *testing.T, name, namespace string) error {
+	t.Logf("waiting for PVC '%s' to be deleted in namespace '%s'", name, namespace)
+	pvc := &corev1.PersistentVolumeClaim{}
+	err := wait.PollUntilContextTimeout(context.TODO(), a.RetryInterval, a.Timeout, true, func(ctx context.Context) (bool, error) {
+		pvc = &corev1.PersistentVolumeClaim{}
+		err := a.Client.Get(ctx, test.NamespacedName(namespace, name), pvc)
+		if err != nil {
+			if errors.IsNotFound(err) {
+				return true, nil
+			}
+			return false, err
+		}
+		return false, nil
+	})
+	if err != nil {
+		t.Logf("failed waiting for PVC '%s' to be deleted in namespace '%s': %q", name, namespace, pvc)
+	}
+	return err
+}
+
 // WaitForPods waits until "n" number of pods exist in the given namespace
 func (a *MemberAwaitility) WaitForPods(t *testing.T, namespace string, n int, criteria ...PodWaitCriterion) ([]corev1.Pod, error) {
 	t.Logf("waiting for Pods in namespace '%s' with matching criteria", namespace)