fix topology-rbac and kubernetes-rbac tests in k8s jobs

Author: sanketpathak

.ci/pipelines/utils.sh

@@ -345,23 +345,26 @@ apply_yaml_files() {
   common::create_configmap_from_file "dynamic-global-header-config" "$project" \
     "dynamic-global-header-config.yaml" "$dir/resources/config_map/dynamic-global-header-config.yaml"
 
-  # Skip Tekton and Topology resources for K8s deployments (AKS/EKS/GKE)
+  # Skip Tekton resources for K8s deployments (AKS/EKS/GKE)
   # Tekton tests are not executed in showcase-k8s or showcase-rbac-k8s projects
   if [[ "$JOB_NAME" != *"aks"* && "$JOB_NAME" != *"eks"* && "$JOB_NAME" != *"gke"* ]]; then
     # Create Pipeline run for tekton test case.
     oc apply -f "$dir/resources/pipeline-run/hello-world-pipeline.yaml"
     oc apply -f "$dir/resources/pipeline-run/hello-world-pipeline-run.yaml"
 
-    # Create Deployment and Pipeline for Topology test.
-    oc apply -f "$dir/resources/topology_test/topology-test.yaml"
-    if [[ -z "${IS_OPENSHIFT}" || "${IS_OPENSHIFT}" == "false" ]]; then
-      kubectl apply -f "$dir/resources/topology_test/topology-test-ingress.yaml"
-    else
-      oc apply -f "$dir/resources/topology_test/topology-test-route.yaml"
-    fi
   else
-    log::info "Skipping Tekton Pipeline and Topology resources for K8s deployment (${JOB_NAME})"
+    log::info "Skipping Tekton Pipeline resources for K8s deployment (${JOB_NAME})"
   fi
+
+  # Create Deployment and Pipeline for Topology test.
+  oc apply -f "$dir/resources/topology_test/topology-test.yaml"
+
+  if [[ -z "${IS_OPENSHIFT}" || "${IS_OPENSHIFT}" == "false" ]]; then
+    kubectl apply -f "$dir/resources/topology_test/topology-test-ingress.yaml"
+  else
+    oc apply -f "$dir/resources/topology_test/topology-test-route.yaml"
+  fi
+
 }
 
 deploy_test_backstage_customization_provider() {
@@ -514,19 +517,29 @@ cluster_setup_ocp_operator() {
 
 cluster_setup_k8s_operator() {
   operator::install_olm
-  # Tekton not installed for K8s deployments (AKS/EKS/GKE)
-  # Tekton tests are not executed in showcase-k8s or showcase-rbac-k8s projects
-  # operator::install_tekton
+  # Install Tekton Pipelines for K8s deployments (AKS/EKS/GKE) for topology tests to work
+  operator::install_tekton
   # operator::install_postgres_k8s # Works with K8s but disabled in values file
+
+  # Wait for Tekton Pipelines to be ready before proceeding
+  log::info "Waiting for Tekton Pipelines to be ready..."
+  k8s_wait::deployment "tekton-pipelines" "tekton-pipelines-webhook" 30 10 || return 1
+  k8s_wait::endpoint "tekton-pipelines-webhook" "tekton-pipelines" 1800 10 || return 1
+  k8s_wait::crd "pipelines.tekton.dev" 120 5 || return 1
 }
 
 cluster_setup_k8s_helm() {
-  # Tekton not installed for K8s deployments (AKS/EKS/GKE)
-  # Tekton tests are not executed in showcase-k8s or showcase-rbac-k8s projects
-  log::info "Skipping Tekton installation for K8s Helm deployment"
+  # Install Tekton Pipelines for K8s deployments (AKS/EKS/GKE) for topology tests to work
+  log::info "Installing Tekton Pipelines for K8s Helm deployment"
   # operator::install_olm
-  # operator::install_tekton
+  operator::install_tekton
   # operator::install_postgres_k8s # Works with K8s but disabled in values file
+
+  # # Wait for Tekton Pipelines to be ready before proceeding
+  log::info "Waiting for Tekton Pipelines to be ready..."
+  k8s_wait::deployment "tekton-pipelines" "tekton-pipelines-webhook" 30 10 || return 1
+  k8s_wait::endpoint "tekton-pipelines-webhook" "tekton-pipelines" 1800 10 || return 1
+  k8s_wait::crd "pipelines.tekton.dev" 120 5 || return 1
 }
 
 # ==============================================================================

e2e-tests/playwright/e2e/plugins/kubernetes/kubernetes-rbac.spec.ts

@@ -6,9 +6,6 @@ import { KUBERNETES_COMPONENTS } from "../../../support/page-objects/page-obj";
 import { KubernetesPage } from "../../../support/pages/kubernetes";
 
 test.describe("Test Kubernetes Plugin", () => {
-  // TODO: https://issues.redhat.com/browse/RHDHBUGS-2817
-  test.fixme(() => process.env.IS_OPENSHIFT === "false");
-
   let common: Common;
   let uiHelper: UIhelper;
   let catalog: Catalog;

e2e-tests/playwright/e2e/plugins/topology/topology-rbac.spec.ts

@@ -5,9 +5,6 @@ import { Catalog } from "../../../support/pages/catalog";
 import { Topology } from "../../../support/pages/topology";
 
 test.describe("Test Topology Plugin with RBAC", () => {
-  // TODO: https://issues.redhat.com/browse/RHDHBUGS-2817
-  test.fixme(() => process.env.IS_OPENSHIFT === "false");
-
   let common: Common;
   let uiHelper: UIhelper;
   let catalog: Catalog;

e2e-tests/playwright/e2e/plugins/topology/topology.spec.ts

@@ -119,9 +119,7 @@ async function testIngressResources(page: Page, uiHelper: UIhelper) {
       .first(),
   ).toBeVisible();
   // Verify code block is visible (pre element containing configuration)
-  await expect(
-    page.getByText(/apiVersion:|kind:|metadata:/).first(),
-  ).toBeVisible();
+  await expect(page.getByText(/rules:/).first()).toBeVisible();
 }
 
 async function testRouteResources(page: Page, uiHelper: UIhelper) {