merged the orchestrator specs down to two

Signed-off-by: rostalan <rlan@redhat.com>

Author: rostalan

workspaces/orchestrator/e2e-tests/playwright.config.ts

@@ -10,13 +10,12 @@ export default defineConfig({
   projects: [
     {
       name: "orchestrator",
-      testMatch: "specs/**/*.spec.ts",
-      testIgnore: "specs/**/*-rbac.spec.ts",
+      testMatch: "specs/orchestrator.spec.ts",
     },
     {
       name: "orchestrator-rbac",
       dependencies: ["orchestrator"],
-      testMatch: "specs/**/*-rbac.spec.ts",
+      testMatch: "specs/orchestrator-rbac.spec.ts",
     },
   ],
 });

workspaces/orchestrator/e2e-tests/tests/specs/deploy-sonataflow.ts

@@ -1,24 +1,84 @@
+import { readdir, readFile, writeFile } from "fs/promises";
+import { join } from "path";
 import { installOrchestrator } from "rhdh-e2e-test-utils/orchestrator";
 import { $ } from "rhdh-e2e-test-utils/utils";
 
 const WORKFLOW_REPO =
   "https://github.com/rhdhorchestrator/serverless-workflows.git";
 
+const MANIFEST_DIRS = [
+  "workflows/greeting/manifests",
+  "workflows/fail-switch/src/main/resources/manifests",
+];
+
 export async function deploySonataflow(namespace: string): Promise<void> {
   await installOrchestrator(namespace);
 
   const workflowDir = `/tmp/serverless-workflows-${process.pid}`;
   try {
     await $`git clone --depth=1 ${WORKFLOW_REPO} ${workflowDir}`;
-    await $`oc apply -n ${namespace} -f ${workflowDir}/workflows/greeting/manifests/`;
-    await $`oc apply -n ${namespace} -f ${workflowDir}/workflows/fail-switch/src/main/resources/manifests/`;
+    await patchWorkflowPersistence(workflowDir, namespace);
+    for (const rel of MANIFEST_DIRS) {
+      await $`oc apply -n ${namespace} -f ${join(workflowDir, rel)}`;
+    }
   } finally {
     await $`rm -rf ${workflowDir}`.catch(() => {});
   }
 
   await waitForWorkflows(namespace);
 }
 
+/**
+ * The upstream serverless-workflows manifests expect a Helm-chart-style
+ * PostgreSQL (secret: sonataflow-psql-postgresql, keys: postgres-username /
+ * postgres-password).  The e2e infrastructure creates a different layout
+ * (secret: backstage-psql-secret, keys: POSTGRES_USER / POSTGRES_PASSWORD).
+ * Patch the cloned manifests so the SonataFlow CRs reference the resources
+ * that actually exist.
+ */
+async function patchWorkflowPersistence(
+  workflowDir: string,
+  namespace: string,
+): Promise<void> {
+  const result = await $`oc get secrets -n ${namespace} -o name`;
+  const secretName = result.stdout
+    .trim()
+    .split("\n")
+    .find((s) => s.includes("backstage-psql"))
+    ?.replace("secret/", "");
+
+  if (!secretName) {
+    throw new Error(
+      `backstage-psql secret not found in namespace ${namespace}`,
+    );
+  }
+
+  const replacements: [RegExp, string][] = [
+    [/sonataflow-psql-postgresql/g, secretName],
+    [/postgres-username/g, "POSTGRES_USER"],
+    [/postgres-password/g, "POSTGRES_PASSWORD"],
+    [
+      /databaseName: sonataflow\b/g,
+      "databaseName: backstage_plugin_orchestrator",
+    ],
+  ];
+
+  for (const rel of MANIFEST_DIRS) {
+    const dir = join(workflowDir, rel);
+    const files = (await readdir(dir)).filter(
+      (f) => f.endsWith(".yaml") || f.endsWith(".yml"),
+    );
+    for (const file of files) {
+      const path = join(dir, file);
+      let content = await readFile(path, "utf-8");
+      for (const [pattern, replacement] of replacements) {
+        content = content.replace(pattern, replacement);
+      }
+      await writeFile(path, content);
+    }
+  }
+}
+
 async function waitForWorkflows(namespace: string): Promise<void> {
   const resourceDeadline = Date.now() + 60_000;
   while (Date.now() < resourceDeadline) {