Generate merged Allure report artifacts

Author: emmaoke-w

.github/workflows/qa-android-ui-tests.yml

@@ -623,15 +623,139 @@ jobs:
             adb -s "${SERIAL}" pull "/sdcard/googletest/test_outputfiles/allure-results" "${OUT_DIR}/${SERIAL}" >/dev/null 2>&1 || true
           done
 
+      - name: Merge Allure results (add device label)
+        if: always()
+        env:
+          OUT_DIR: ${{ runner.temp }}/allure-results
+          MERGED_DIR: ${{ runner.temp }}/allure-results-merged
+        run: |
+          set -euo pipefail
+          python3 - <<'PY'
+          import json
+          import os
+          import shutil
+          import subprocess
+          from pathlib import Path
+
+          out_dir = Path(os.environ["OUT_DIR"])
+          merged_dir = Path(os.environ["MERGED_DIR"])
+          merged_dir.mkdir(parents=True, exist_ok=True)
+
+          def get_prop(serial: str, prop: str) -> str:
+              try:
+                  result = subprocess.run(
+                      ["adb", "-s", serial, "shell", "getprop", prop],
+                      check=False,
+                      capture_output=True,
+                      text=True,
+                      timeout=5,
+                  )
+                  return result.stdout.strip()
+              except Exception:
+                  return ""
+
+          device_dirs = [p for p in out_dir.iterdir() if p.is_dir()]
+          device_info = {}
+          for device_dir in device_dirs:
+              serial = device_dir.name
+              model = get_prop(serial, "ro.product.model") or "unknown"
+              sdk = get_prop(serial, "ro.build.version.release") or get_prop(serial, "ro.build.version.sdk") or "unknown"
+              device_info[serial] = {"model": model, "sdk": sdk}
+
+          def device_label(serial: str) -> str:
+              meta = device_info.get(serial, {})
+              model = meta.get("model") or "unknown"
+              sdk = meta.get("sdk") or "unknown"
+              return f"{model} - {sdk} ({serial})"
+
+          def add_label(data: dict, name: str, value: str) -> dict:
+              labels = [l for l in data.get("labels", []) if l.get("name") != name]
+              labels.append({"name": name, "value": value})
+              data["labels"] = labels
+              return data
+
+          for device_dir in device_dirs:
+              serial = device_dir.name
+              src_dir = device_dir / "allure-results"
+              if not src_dir.is_dir():
+                  src_dir = device_dir
+              if not src_dir.is_dir():
+                  continue
+
+              label = device_label(serial)
+              for item in src_dir.iterdir():
+                  if item.is_dir():
+                      continue
+                  if item.name in ("executor.json", "environment.properties"):
+                      continue
+                  if item.name.endswith("-result.json"):
+                      try:
+                          data = json.loads(item.read_text(encoding="utf-8"))
+                      except Exception:
+                          continue
+                      data = add_label(data, "device", label)
+                      (merged_dir / item.name).write_text(
+                          json.dumps(data, ensure_ascii=True),
+                          encoding="utf-8",
+                      )
+                  else:
+                      shutil.copy2(item, merged_dir / item.name)
+
+          if device_info:
+              devices = ", ".join(device_label(serial) for serial in sorted(device_info.keys()))
+              (merged_dir / "environment.properties").write_text(
+                  f"devices={devices}\n", encoding="utf-8"
+              )
+
+          run_id = os.environ.get("GITHUB_RUN_ID", "")
+          repo = os.environ.get("GITHUB_REPOSITORY", "")
+          server = os.environ.get("GITHUB_SERVER_URL", "https://github.com")
+          run_url = f"{server}/{repo}/actions/runs/{run_id}" if repo and run_id else ""
+          executor = {
+              "name": "GitHub Actions",
+              "type": "github",
+              "url": run_url,
+              "buildName": os.environ.get("GITHUB_RUN_NUMBER", ""),
+              "buildUrl": run_url,
+              "reportName": "Android UI Tests",
+          }
+          (merged_dir / "executor.json").write_text(
+              json.dumps(executor, ensure_ascii=True),
+              encoding="utf-8",
+          )
+          PY
+
+      - name: Generate Allure HTML report
+        if: always()
+        env:
+          MERGED_DIR: ${{ runner.temp }}/allure-results-merged
+          REPORT_DIR: ${{ runner.temp }}/allure-report
+        run: |
+          set -euo pipefail
+          if [[ ! -d "${MERGED_DIR}" ]]; then
+            echo "No merged Allure results found"
+            exit 0
+          fi
+
+          ALLURE_VERSION="2.29.0"
+          ALLURE_TGZ="${RUNNER_TEMP}/allure-${ALLURE_VERSION}.tgz"
+          curl -fsSL -o "${ALLURE_TGZ}" \
+            "https://github.com/allure-framework/allure2/releases/download/${ALLURE_VERSION}/allure-${ALLURE_VERSION}.tgz"
+          tar -xzf "${ALLURE_TGZ}" -C "${RUNNER_TEMP}"
+          "${RUNNER_TEMP}/allure-${ALLURE_VERSION}/bin/allure" \
+            generate "${MERGED_DIR}" -o "${REPORT_DIR}" --clean
+
       - name: Upload test artifacts
         if: always()
         uses: actions/upload-artifact@v4
         with:
           name: android-ui-test-results
           if-no-files-found: warn
+          retention-days: 90
           path: |
             tests/testsCore/build/reports/androidTests/connected
-            ${{ runner.temp }}/allure-results
+            ${{ runner.temp }}/allure-results-merged
+            ${{ runner.temp }}/allure-report
 
       - name: Cleanup (remove secrets + build outputs)
         if: always()
@@ -640,6 +764,8 @@ jobs:
           rm -f "${RUNNER_TEMP}/secrets.json" || true
           rm -f "${RUNNER_TEMP}/Wire.apk" "${RUNNER_TEMP}/Wire.old.apk" || true
           rm -rf "${RUNNER_TEMP}/allure-results" || true
+          rm -rf "${RUNNER_TEMP}/allure-results-merged" || true
+          rm -rf "${RUNNER_TEMP}/allure-report" || true
 
           # Remove build outputs (these can contain BuildConfig secrets) but keep Gradle caches
           git clean -ffdx -e .gradle -e .kotlin