refactor and fix ci

Signed-off-by: Nikita Korolev <nikita.korolev@flant.com>

Author: universal-itengineer

.github/scripts/js/e2e/report/cluster-report.js

@@ -346,7 +346,9 @@ async function buildClusterReport({ core, context }) {
   }
 
   const effectiveStageInfo =
-    stageInfo.reportKind === "tests" && parsedReport.source === "empty"
+    stageInfo.status === "success" &&
+    stageInfo.reportKind === "tests" &&
+    parsedReport.source === "empty"
       ? buildArtifactMissingDescriptor(config.storageType)
       : stageInfo;
 

.github/scripts/js/e2e/report/cluster-report.test.js

@@ -335,4 +335,44 @@ describe("cluster-report", () => {
       expect(report.failedStageLabel).toBe("TEST REPORTS NOT FOUND");
       expect(report.status).toBe("missing");
     }));
+
+  test("keeps cancelled test stage when no reports were found", async () =>
+    withTempDir(async (tempDir) => {
+      const reportFile = path.join(tempDir, "report.json");
+      setStageEnv({
+        E2E_REPORT_DIR: tempDir,
+        REPORT_FILE: reportFile,
+        E2E_TEST_RESULT: "cancelled",
+      });
+
+      const report = await buildClusterReport({
+        core: createCore(),
+        context: createContext(),
+      });
+
+      expect(report.reportKind).toBe("tests");
+      expect(report.failedStage).toBe("e2e-test");
+      expect(report.failedStageLabel).toBe("E2E TEST");
+      expect(report.status).toBe("cancelled");
+    }));
+
+  test("keeps failed test stage when no reports were found", async () =>
+    withTempDir(async (tempDir) => {
+      const reportFile = path.join(tempDir, "report.json");
+      setStageEnv({
+        E2E_REPORT_DIR: tempDir,
+        REPORT_FILE: reportFile,
+        E2E_TEST_RESULT: "failure",
+      });
+
+      const report = await buildClusterReport({
+        core: createCore(),
+        context: createContext(),
+      });
+
+      expect(report.reportKind).toBe("tests");
+      expect(report.failedStage).toBe("e2e-test");
+      expect(report.failedStageLabel).toBe("E2E TEST");
+      expect(report.status).toBe("failure");
+    }));
 });

.github/workflows/e2e-matrix.yml

@@ -477,6 +477,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Setup Node.js for report scripts
+        uses: actions/setup-node@v6
+        with:
+          node-version: "20"
+          cache: npm
+          cache-dependency-path: .github/scripts/js/package-lock.json
+
+      - name: Install report script dependencies
+        working-directory: .github/scripts/js
+        run: npm ci
+
       - name: Download E2E report artifacts
         uses: actions/download-artifact@v5
         continue-on-error: true
@@ -497,13 +508,13 @@ jobs:
           REPORT_FALLBACK_REPLICATED_FAILED_STAGE: ${{ needs.e2e-replicated.outputs.failed_stage }}
           REPORT_FALLBACK_REPLICATED_FAILED_STAGE_LABEL: ${{ needs.e2e-replicated.outputs.failed_stage_label }}
           REPORT_FALLBACK_REPLICATED_WORKFLOW_RUN_URL: ${{ needs.e2e-replicated.outputs.workflow_run_url }}
-          REPORT_FALLBACK_REPLICATED_BRANCH: ${{ needs.e2e-replicated.outputs.branch }}
+          REPORT_FALLBACK_REPLICATED_BRANCH: ${{ needs.e2e-replicated.outputs.branch || github.ref_name }}
           REPORT_FALLBACK_NFS_REPORT_KIND: ${{ needs.e2e-nfs.outputs.report_kind }}
           REPORT_FALLBACK_NFS_STATUS: ${{ needs.e2e-nfs.outputs.status }}
           REPORT_FALLBACK_NFS_FAILED_STAGE: ${{ needs.e2e-nfs.outputs.failed_stage }}
           REPORT_FALLBACK_NFS_FAILED_STAGE_LABEL: ${{ needs.e2e-nfs.outputs.failed_stage_label }}
           REPORT_FALLBACK_NFS_WORKFLOW_RUN_URL: ${{ needs.e2e-nfs.outputs.workflow_run_url }}
-          REPORT_FALLBACK_NFS_BRANCH: ${{ needs.e2e-nfs.outputs.branch }}
+          REPORT_FALLBACK_NFS_BRANCH: ${{ needs.e2e-nfs.outputs.branch || github.ref_name }}
           LOOP_API_BASE_URL: ${{ secrets.LOOP_API_BASE_URL }}
           LOOP_CHANNEL_ID: ${{ secrets.LOOP_CHANNEL_ID }}
           LOOP_TOKEN: ${{ secrets.LOOP_TOKEN }}

.github/workflows/e2e-reusable-pipeline.yml

@@ -1348,6 +1348,17 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
+      - name: Setup Node.js for report scripts
+        uses: actions/setup-node@v6
+        with:
+          node-version: "20"
+          cache: npm
+          cache-dependency-path: .github/scripts/js/package-lock.json
+
+      - name: Install report script dependencies
+        working-directory: .github/scripts/js
+        run: npm ci
+
       - name: Download E2E test results if available
         uses: actions/download-artifact@v5
         continue-on-error: true