Merge remote-tracking branch 'origin/main' into rhidp-15075-cluster-free-e2e-harness

# Conflicts:
#	e2e-tests/package.json

Author: gustavolira

.ci/images/Dockerfile

@@ -1,6 +1,6 @@
 # Base image from Microsoft Playwright
 # Playwright v1.59.1-noble includes Node 24.14.1
-FROM mcr.microsoft.com/playwright:v1.60.0-noble@sha256:beddddcf96f19abec078cd2f3da676f40abd460e0e734ad5eed73627ce161d33
+FROM mcr.microsoft.com/playwright:v1.61.1-noble@sha256:824f1a789072e648c62541c2cfa4479c4061a290d5c27766d67dc1dcbc19b321
 
 # Set environment variables for the container
 ENV CI=1 \

.ci/package.json

@@ -11,7 +11,7 @@
     "prettier:fix": "npx prettier --write **/*.{sh,md,yaml,yml}"
   },
   "devDependencies": {
-    "prettier": "3.8.3",
+    "prettier": "3.8.4",
     "prettier-plugin-sh": "0.18.1",
     "shellcheck": "4.1.0"
   },

.ci/pipelines/jobs/ocp-nightly.sh

@@ -47,35 +47,17 @@ run_standard_deployment_tests() {
 }
 
 run_runtime_config_change_tests() {
-  # Deploy `showcase-runtime` to run tests that require configuration changes at runtime
-
-  # Create the namespace first (this will delete/recreate it)
-  namespace::configure "${NAME_SPACE_RUNTIME}"
-
-  # Configure external PostgreSQL credentials and certificates for runtime namespace
-  # This creates postgres-crt and postgres-cred secrets needed by values-showcase-postgres.yaml
-  # IMPORTANT: Must be called AFTER namespace is created but BEFORE helm install
-  configure_external_postgres_db "${NAME_SPACE_RUNTIME}"
-
-  # Deploy RHDH with Helm (skip namespace creation since we already did it)
-  helm::uninstall "${NAME_SPACE_RUNTIME}" "${RELEASE_NAME}"
-  oc apply -f "$DIR/resources/postgres-db/dynamic-plugins-root-PVC.yaml" -n "${NAME_SPACE_RUNTIME}"
-  # shellcheck disable=SC2046
-  helm upgrade -i "${RELEASE_NAME}" -n "${NAME_SPACE_RUNTIME}" \
-    "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
-    -f "$DIR/resources/postgres-db/values-showcase-postgres.yaml" \
-    --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
-    $(helm::get_image_params)
-
-  # Configure schema-mode environment (opt-in: tests skip if env not configured)
-  if configure_schema_mode_runtime_env "${NAME_SPACE_RUNTIME}" "${RELEASE_NAME}" helm; then
-    log::info "Schema-mode environment configured successfully; schema-mode tests will run"
-  else
-    log::warn "Schema-mode environment not configured; schema-mode tests will skip (this is expected if PostgreSQL is not available)"
-  fi
-
+  # Runtime tests handle their own deployment via TypeScript (runtime-deploy.ts).
+  # The first test file (config-map.spec.ts) calls ensureRuntimeDeployed() which:
+  #   - Creates the namespace
+  #   - Deploys RHDH with Helm + internal PostgreSQL sub-chart
+  #   - Configures schema-mode env vars for port-forwarding
+  # Subsequent test files reuse the existing deployment (workers: 1).
+  #
+  # The CI wrapper only needs to set environment variables and invoke Playwright.
+
+  export INSTALL_METHOD="helm"
   local runtime_url="https://${RELEASE_NAME}-developer-hub-${NAME_SPACE_RUNTIME}.${K8S_CLUSTER_ROUTER_BASE}"
-  # Run tests - allow failures since schema-mode tests are opt-in
   testing::run_tests "${RELEASE_NAME}" "${NAME_SPACE_RUNTIME}" "${PW_PROJECT_SHOWCASE_RUNTIME}" "${runtime_url}" || true
 }
 

.ci/pipelines/jobs/ocp-operator.sh

@@ -68,48 +68,15 @@ initiate_operator_deployments_osd_gcp() {
 }
 
 run_operator_runtime_config_change_tests() {
-  # Deploy `showcase-runtime` to run tests that require configuration changes at runtime.
-  # Uses enableLocalDb=false with external Crunchy PostgreSQL for both runtime and schema-mode tests.
-  namespace::configure "${NAME_SPACE_RUNTIME}"
-
+  # Runtime tests handle their own deployment via TypeScript (runtime-deploy.ts).
+  # The first test file (config-map.spec.ts) calls ensureRuntimeDeployed() which:
+  #   - Creates the namespace
+  #   - Deploys RHDH via the operator with internal PostgreSQL
+  #   - Configures schema-mode env vars for port-forwarding
+  # Subsequent test files reuse the existing deployment (workers: 1).
+  #
+  # INSTALL_METHOD=operator is already exported in handle_ocp_operator().
   local runtime_url="https://backstage-${RELEASE_NAME}-${NAME_SPACE_RUNTIME}.${K8S_CLUSTER_ROUTER_BASE}"
-  local postgres_ready
-  postgres_ready=false
-
-  # Set up real external PostgreSQL (Crunchy) instead of placeholder secrets.
-  # Creates postgres-cred and postgres-crt secrets in NAME_SPACE_RUNTIME.
-  # IMPORTANT: Must be called AFTER namespace is created but BEFORE operator deployment.
-  namespace::configure "${NAME_SPACE_POSTGRES_DB}"
-  if configure_external_postgres_db "${NAME_SPACE_RUNTIME}"; then
-    postgres_ready=true
-    # Add RHDH_RUNTIME_URL to postgres-cred (rds-app-config.yaml references it for baseUrl).
-    # configure_external_postgres_db creates postgres-cred with POSTGRES_* keys only.
-    local runtime_url_b64
-    runtime_url_b64=$(common::base64_encode "${runtime_url}")
-    oc patch secret postgres-cred -n "${NAME_SPACE_RUNTIME}" \
-      --type=json \
-      -p "[{\"op\":\"add\",\"path\":\"/data/RHDH_RUNTIME_URL\",\"value\":\"${runtime_url_b64}\"}]"
-  else
-    log::warn "External PostgreSQL setup failed; falling back to placeholder secrets (schema-mode tests will skip)"
-    create_postgres_cred_secret "${NAME_SPACE_RUNTIME}" "tmp" "tmp" "RHDH_RUNTIME_URL=${runtime_url}"
-    oc apply -f "$DIR/resources/postgres-db/postgres-crt.yaml" -n "${NAME_SPACE_RUNTIME}"
-  fi
-
-  config::create_app_config_map "$DIR/resources/postgres-db/rds-app-config.yaml" "${NAME_SPACE_RUNTIME}"
-  config::create_dynamic_plugins_config "${DIR}/resources/postgres-db/values-showcase-postgres.yaml" "/tmp/configmap-dynamic-plugins-runtime.yaml"
-  oc apply -f /tmp/configmap-dynamic-plugins-runtime.yaml -n "${NAME_SPACE_RUNTIME}"
-  deploy_rhdh_operator "${NAME_SPACE_RUNTIME}" "${DIR}/resources/rhdh-operator/rhdh-start-runtime.yaml" "true"
-
-  # Configure schema-mode environment variables (opt-in: tests skip if not configured).
-  # Only attempt if external PostgreSQL was set up successfully.
-  if [[ "${postgres_ready}" == "true" ]]; then
-    if configure_schema_mode_runtime_env "${NAME_SPACE_RUNTIME}" "${RELEASE_NAME}" operator; then
-      log::info "Schema-mode environment configured successfully; schema-mode tests will run"
-    else
-      log::warn "Schema-mode environment not configured; schema-mode tests will skip (this is expected if PostgreSQL is not available)"
-    fi
-  fi
-
   testing::run_tests "${RELEASE_NAME}" "${NAME_SPACE_RUNTIME}" "${PW_PROJECT_SHOWCASE_RUNTIME}" "${runtime_url}" || true
 }
 

.ci/pipelines/lib/schema-mode-env.sh

@@ -24,12 +24,14 @@ configure_schema_mode_runtime_env() {
   local forward_via_pod=0
   local rhdh_psql_svc_name="redhat-developer-hub-postgresql"
 
-  local -a helm_svc_candidates=(
+  # Service candidates: Helm sub-chart pattern first, then operator pattern
+  local -a svc_candidates=(
     "${release_name}-postgresql"
     "${rhdh_psql_svc_name}"
+    "backstage-psql-${release_name}"
   )
   local hsvc
-  for hsvc in "${helm_svc_candidates[@]}"; do
+  for hsvc in "${svc_candidates[@]}"; do
     if oc get svc "${hsvc}" -n "${runtime_namespace}" &> /dev/null; then
       postgres_service="${hsvc}"
       forward_namespace="${runtime_namespace}"
@@ -38,9 +40,11 @@ configure_schema_mode_runtime_env() {
   done
 
   if [[ -n "${postgres_service}" ]]; then
+    # Secret candidates: Helm pattern first, then operator pattern
     local -a secret_candidates=(
       "${release_name}-postgresql"
       "${rhdh_psql_svc_name}"
+      "backstage-psql-secret-${release_name}"
       "postgres-cred"
     )
     local sec
@@ -49,6 +53,9 @@ configure_schema_mode_runtime_env() {
         continue
       fi
       admin_password=$(oc get secret "${sec}" -n "${runtime_namespace}" -o jsonpath='{.data.postgres-password}' 2> /dev/null | base64 -d || true)
+      if [[ -z "${admin_password}" ]]; then
+        admin_password=$(oc get secret "${sec}" -n "${runtime_namespace}" -o jsonpath='{.data.POSTGRESQL_ADMIN_PASSWORD}' 2> /dev/null | base64 -d || true)
+      fi
       if [[ -z "${admin_password}" ]]; then
         admin_password=$(oc get secret "${sec}" -n "${runtime_namespace}" -o jsonpath='{.data.POSTGRES_PASSWORD}' 2> /dev/null | base64 -d || true)
       fi

.ci/pipelines/resources/postgres-db/rds-app-config.yaml

@@ -260,7 +260,7 @@ configure_external_postgres_db() {
   fi
 
   # Create postgres-crt secret for Backstage deployment (Helm/Operator)
-  # This secret is referenced by rhdh-start-runtime.yaml and values-showcase-postgres.yaml
+  # This secret is referenced by RBAC deployment values and operator CRs
   if ! oc create secret generic postgres-crt \
     --from-file=postgres-crt.pem=postgres-ca \
     --dry-run=client -o yaml | oc apply -f - --namespace="${project}"; then
@@ -433,7 +433,7 @@ cluster_setup_k8s_helm() {
 # Functions: base_deployment, rbac_deployment, initiate_deployments,
 #            base_deployment_osd_gcp, rbac_deployment_osd_gcp, initiate_deployments_osd_gcp,
 #            initiate_upgrade_base_deployments, initiate_upgrade_deployments,
-#            initiate_runtime_deployment, initiate_sanity_plugin_checks_deployment,
+#            initiate_sanity_plugin_checks_deployment,
 #            apply_yaml_files, deploy_test_backstage_customization_provider,
 #            deploy_redis_cache, configure_external_postgres_db
 # ==============================================================================
@@ -650,22 +650,6 @@ initiate_upgrade_deployments() {
   save_all_pod_logs "$namespace"
 }
 
-initiate_runtime_deployment() {
-  local release_name=$1
-  local namespace=$2
-  namespace::configure "${namespace}"
-  helm::uninstall "${namespace}" "${release_name}"
-
-  oc apply -f "$DIR/resources/postgres-db/dynamic-plugins-root-PVC.yaml" -n "${namespace}"
-
-  # shellcheck disable=SC2046
-  helm upgrade -i "${release_name}" -n "${namespace}" \
-    "${HELM_CHART_URL}" --version "${CHART_VERSION}" \
-    -f "$DIR/resources/postgres-db/values-showcase-postgres.yaml" \
-    --set global.clusterRouterBase="${K8S_CLUSTER_ROUTER_BASE}" \
-    $(helm::get_image_params)
-}
-
 initiate_sanity_plugin_checks_deployment() {
   local release_name=$1
   local name_space_sanity_plugins_check=$2