haven-cypress-integration 1.6.2 → 2.0.1

package/templates/run-filtered.sh

@@ -1,10 +1,10 @@
 #!/bin/bash
+set -e
 
-echo "🔥 RUN SCRIPT:"
-echo "✅ ENTERED run-filtered.sh"
-echo "⚙️ Raw args: $@"
+echo "CYPRESS RUN SCRIPT"
+echo "Raw args: $@"
 
-# Extract automation IDs and custom tags from CLI args
+# Parse --automationIds and --customTags input from args
 AUTOMATION_IDS=""
 CUSTOM_TAGS=""
 for arg in "$@"; do
@@ -20,92 +20,189 @@ for arg in "$@"; do
   esac
 done
 
-echo "🔍 Extracted automation IDs: ${AUTOMATION_IDS}"
-echo "🔍 Extracted custom tags: ${CUSTOM_TAGS}"
-echo "📂 Current working directory: $(pwd)"
+echo "automationIds: ${AUTOMATION_IDS}"
+echo "customTags: ${CUSTOM_TAGS}"
 
-# Build grep arguments for Cypress
-CYPRESS_GREP=""
-GREP_TAGS=""
+TIMESTAMP=$(date +%m%d%Y_%H%M%S)
+PRODUCT_NAME=${PRODUCT_NAME:-unknown_product}
+PLAN_ID=${PLAN_ID:-unknown_plan}
+RUN_ID=${RUN_ID:-unknown_run}
+BUCKET_NAME=${BUCKET_NAME:-your-default-bucket}
+TEST_ENVIRONMENT=${TEST_ENVIRONMENT:-QA}
+
+# =============================================================================
+# ADO CLONE MODE (Thin Image)
+# =============================================================================
+# If ADO_REPO is set, clone app code from Azure DevOps at runtime.
+# This enables "thin image" mode where app code is NOT baked into the image.
+#
+# Required env vars:
+#   ADO_REPO  - Full ADO repo path (e.g., dev.azure.com/org/project/_git/repo)
+#   ADO_PAT   - Personal Access Token for authentication
+# Optional env vars:
+#   ADO_BRANCH - Branch to clone (default: main)
+# =============================================================================
 
-if [ -n "$AUTOMATION_IDS" ]; then
-  # Strip quotes from arg, replace commas with spaces
-  RAW_IDS=$(echo "$AUTOMATION_IDS" | sed "s/^['\"]//;s/['\"]$//")
-  CLEANED_IDS="${RAW_IDS//,/ }"
-  GREP_TAGS="${CLEANED_IDS}"
-  echo "🚀 Running Cypress with automation IDs: ${CLEANED_IDS}"
+if [ -n "$ADO_REPO" ]; then
+  echo "=== ADO Clone Mode ==="
+  ADO_BRANCH=${ADO_BRANCH:-main}
+  
+  git clone --branch "$ADO_BRANCH" --depth 1 \
+    "https://${ADO_PAT}@${ADO_REPO}" /app
+  
+  cd /app
+  npm ci
+  echo "=== Clone Complete ==="
+else
+  echo "=== Full Image Mode (app code pre-baked) ==="
 fi
 
-if [ -n "$CUSTOM_TAGS" ]; then
-  # Strip quotes from arg, replace commas with spaces
-  RAW_TAGS=$(echo "$CUSTOM_TAGS" | sed "s/^['\"]//;s/['\"]$//")
-  CLEANED_TAGS="${RAW_TAGS//,/ }"
+# S3 artifact path for uploads
+S3_ARTIFACT_PATH="s3://${BUCKET_NAME}/artifacts/${PRODUCT_NAME}/${PLAN_ID}/automation/${RUN_ID}"
+echo "S3 artifact path: ${S3_ARTIFACT_PATH}"
+
+# Ensure results directory exists
+RESULTS_DIR="results"
+MOCHAWESOME_DIR="${RESULTS_DIR}/mochawesome"
+mkdir -p "$MOCHAWESOME_DIR"
+
+# Clean previous reports
+echo "Cleaning mochawesome reports"
+rm -rf ${MOCHAWESOME_DIR}/*
+
+# Start background log uploader (uploads every 30 seconds for real-time visibility)
+echo "Starting real-time log uploader..."
+LOG_UPLOADER_PID=""
+(
+  while true; do
+    sleep 30
+    if [ -f ${RESULTS_DIR}/logs.txt ]; then
+      aws s3 cp ${RESULTS_DIR}/logs.txt "${S3_ARTIFACT_PATH}/live-output.log" --quiet 2>/dev/null || true
+    fi
+  done
+) &
+LOG_UPLOADER_PID=$!
+
+# Build grep patterns for Cypress
+GREP_TAGS=""
+GREP_INVERT_TAGS=""
+
+# First, check if HAVEN_GREP_PATTERN was passed as env var from Haven
+if [ -n "$HAVEN_GREP_PATTERN" ]; then
+  echo "HAVEN_GREP_PATTERN from env: ${HAVEN_GREP_PATTERN}"
   
-  if [ -n "$GREP_TAGS" ]; then
-    GREP_TAGS="${GREP_TAGS} ${CLEANED_TAGS}"
-  else
-    GREP_TAGS="${CLEANED_TAGS}"
+  # Parse patterns into include/exclude (supports NOT: prefix)
+  IFS='|' read -ra PATTERN_ARRAY <<< "$HAVEN_GREP_PATTERN"
+  for pattern in "${PATTERN_ARRAY[@]}"; do
+    [ -z "$pattern" ] && continue
+    if [[ "$pattern" == NOT:* ]]; then
+      CLEAN_PATTERN="${pattern:4}"
+      GREP_INVERT_TAGS="${GREP_INVERT_TAGS:+$GREP_INVERT_TAGS }${CLEAN_PATTERN}"
+    else
+      GREP_TAGS="${GREP_TAGS:+$GREP_TAGS }${pattern}"
+    fi
+  done
+fi
+
+# If no env var, build from CLI args (fallback for non-Haven runs)
+if [ -z "$GREP_TAGS" ] && [ -z "$GREP_INVERT_TAGS" ]; then
+  if [ -n "$AUTOMATION_IDS" ]; then
+    RAW_IDS=$(echo "$AUTOMATION_IDS" | sed "s/^['\"]//;s/['\"]$//")
+    CLEANED_IDS="${RAW_IDS//,/ }"
+    GREP_TAGS="${CLEANED_IDS}"
+    echo "Automation IDs pattern: ${CLEANED_IDS}"
+  fi
+
+  if [ -n "$CUSTOM_TAGS" ]; then
+    RAW_TAGS=$(echo "$CUSTOM_TAGS" | sed "s/^['\"]//;s/['\"]$//")
+    CLEANED_TAGS="${RAW_TAGS//,/ }"
+    
+    if [ -n "$GREP_TAGS" ]; then
+      GREP_TAGS="${GREP_TAGS} ${CLEANED_TAGS}"
+    else
+      GREP_TAGS="${CLEANED_TAGS}"
+    fi
+    echo "Custom tags pattern: ${CLEANED_TAGS}"
   fi
-  echo "🚀 Running Cypress with custom tags: ${CLEANED_TAGS}"
 fi
 
+# Build Cypress grep arguments
+CYPRESS_GREP_ARGS=""
 if [ -n "$GREP_TAGS" ]; then
-  CYPRESS_GREP="--env grepTags='${GREP_TAGS}'"
-  echo "💡 Final grep tags: ${GREP_TAGS}"
+  export HAVEN_GREP_INCLUDE="${GREP_TAGS}"
+  CYPRESS_GREP_ARGS="--env grepTags='${GREP_TAGS}'"
+  echo "Include pattern (HAVEN_GREP_INCLUDE): ${GREP_TAGS}"
+fi
+
+if [ -n "$GREP_INVERT_TAGS" ]; then
+  export HAVEN_GREP_EXCLUDE="${GREP_INVERT_TAGS}"
+  # Cypress grep uses grepInvert for exclusion
+  if [ -n "$CYPRESS_GREP_ARGS" ]; then
+    CYPRESS_GREP_ARGS="${CYPRESS_GREP_ARGS},grepInvert='${GREP_INVERT_TAGS}'"
+  else
+    CYPRESS_GREP_ARGS="--env grepInvert='${GREP_INVERT_TAGS}'"
+  fi
+  echo "Exclude pattern (HAVEN_GREP_EXCLUDE): ${GREP_INVERT_TAGS}"
+fi
+
+if [ -z "$GREP_TAGS" ] && [ -z "$GREP_INVERT_TAGS" ]; then
+  echo "No tags provided. Running all tests..."
+fi
+
+# Run Cypress
+echo "Running Cypress tests..."
+set +e
+
+if [ -n "$E2E_COMMAND" ]; then
+  echo "Using custom E2E command: $E2E_COMMAND"
+  eval "$E2E_COMMAND" 2>&1 | tee ${RESULTS_DIR}/logs.txt
 else
-  echo "🔁 No tags provided. Running all tests..."
+  echo "Using default: npx cypress run"
+  echo "Final grep args: $CYPRESS_GREP_ARGS"
+  eval "npx cypress run \
+    --headless \
+    --browser chrome \
+    --reporter mochawesome \
+    --reporter-options 'reportDir=${MOCHAWESOME_DIR},overwrite=false,html=false,json=true,timestamp=mmddyyyy_HHMMss' \
+    --env grepFilterSpecs=true,grepUntagged=false,grepEnabled=true,TEST_ENVIRONMENT=${TEST_ENVIRONMENT} \
+    $CYPRESS_GREP_ARGS" 2>&1 | tee ${RESULTS_DIR}/logs.txt
 fi
 
-# Set environment variables
-TIMESTAMP=$(date +%m%d%Y_%H%M%S)
-PRODUCT_NAME=${PRODUCT_NAME:-unknown_product}
-PLAN_ID=${PLAN_ID:-unknown_plan}
-RUN_ID=${RUN_ID:-unknown_run}
-BUCKET_NAME=${BUCKET_NAME:-your-default-bucket}
-TEST_ENVIRONMENT=${TEST_ENVIRONMENT:-QA}
+EXIT_CODE=${PIPESTATUS[0]}
+set -e
 
-# Ensure results directory exists
-mkdir -p results/mochawesome
+# Stop background log uploader
+if [ -n "$LOG_UPLOADER_PID" ]; then
+  kill $LOG_UPLOADER_PID 2>/dev/null || true
+fi
 
-echo "🧹 Cleaning mochawesome reports"
-rm -rf results/mochawesome/*
+# Upload final complete log to S3
+if [ -f ${RESULTS_DIR}/logs.txt ]; then
+  echo "Uploading final test output to S3..."
+  aws s3 cp ${RESULTS_DIR}/logs.txt "${S3_ARTIFACT_PATH}/test-output.log" || echo "Failed to upload test output"
+fi
 
-# Run Cypress
-echo "🚀 Running Cypress tests..."
-echo "💡 Final grep arg: $CYPRESS_GREP"
-eval "npx cypress run \
-  --headless \
-  --browser chrome \
-  --reporter mochawesome \
-  --reporter-options 'reportDir=results/mochawesome,overwrite=false,html=false,json=true,timestamp=mmddyyyy_HHMMss' \
-  --env grepFilterSpecs=true,grepUntagged=false,grepEnabled=true,TEST_ENVIRONMENT=${TEST_ENVIRONMENT} \
-  $CYPRESS_GREP \
-  > results/logs.txt 2>&1"
-
-CYPRESS_EXIT_CODE=$?
-
-# Smart HTML report generation logic
-MOCHAWESOME_DIR="results/mochawesome"
-MERGED_JSON="results/results.json"
+# Merge mochawesome JSON files
+MERGED_JSON="${RESULTS_DIR}/results.json"
 REPORT_HTML="${MOCHAWESOME_DIR}/report.html"
 
-echo "🛠️ Attempting to merge mochawesome JSON files..."
-echo "📁 Contents of ${MOCHAWESOME_DIR}:"
-ls -la ${MOCHAWESOME_DIR}/ || echo "❌ Directory not found"
-echo "🔍 JSON files found:"
-ls ${MOCHAWESOME_DIR}/*.json 2>/dev/null || echo "❌ No JSON files found"
-npx mochawesome-merge ${MOCHAWESOME_DIR}/*.json > "${MERGED_JSON}" 2>&1 || echo "❌ Merge failed"
+echo "Attempting to merge mochawesome JSON files..."
+echo "Contents of ${MOCHAWESOME_DIR}:"
+ls -la ${MOCHAWESOME_DIR}/ || echo "Directory not found"
+echo "JSON files found:"
+ls ${MOCHAWESOME_DIR}/*.json 2>/dev/null || echo "No JSON files found"
+npx mochawesome-merge ${MOCHAWESOME_DIR}/*.json > "${MERGED_JSON}" 2>&1 || echo "Merge failed"
 
 if [ -s "${MERGED_JSON}" ]; then
-  echo "✅ Merge successful. Generating report from merged JSON."
+  echo "Merge successful. Generating report from merged JSON."
   npx marge "${MERGED_JSON}" --reportDir "${MOCHAWESOME_DIR}" --reportFilename report.html
 else
-  echo "⚠️ Merge failed or empty. Falling back to first mochawesome JSON file..."
+  echo "Merge failed or empty. Falling back to first mochawesome JSON file..."
   FIRST_JSON=$(ls ${MOCHAWESOME_DIR}/*.json 2>/dev/null | head -n 1)
   if [ -f "${FIRST_JSON}" ]; then
     npx marge "${FIRST_JSON}" --reportDir "${MOCHAWESOME_DIR}" --reportFilename report.html
   else
-    echo "❌ No valid mochawesome JSON file found for fallback."
+    echo "No valid mochawesome JSON file found for fallback."
   fi
 fi
 
@@ -113,11 +210,11 @@ fi
 SCREENSHOTS_DIR="cypress/screenshots"
 DEST_SCREENSHOTS_DIR="${MOCHAWESOME_DIR}/screenshots"
 if [ -d "$SCREENSHOTS_DIR" ]; then
-  echo "🖼️ Copying screenshots..."
+  echo "Copying screenshots..."
   mkdir -p "$DEST_SCREENSHOTS_DIR"
-  cp -r "$SCREENSHOTS_DIR"/* "$DEST_SCREENSHOTS_DIR" || echo "⚠️ No screenshots to copy"
+  cp -r "$SCREENSHOTS_DIR"/* "$DEST_SCREENSHOTS_DIR" || echo "No screenshots to copy"
 else
-  echo "ℹ️ No screenshots directory found."
+  echo "No screenshots directory found."
 fi
 
 # Zip the mochawesome report
@@ -125,39 +222,36 @@ ZIP_NAME="${PRODUCT_NAME}_${TIMESTAMP}.zip"
 ZIP_PATH="/tmp/${ZIP_NAME}"
 
 if [ -d "${MOCHAWESOME_DIR}" ]; then
-  echo "📦 Zipping mochawesome report and screenshots..."
-  echo "📁 Contents to zip:"
+  echo "Zipping mochawesome report and screenshots..."
+  echo "Contents to zip:"
   ls -la "${MOCHAWESOME_DIR}/"
-  zip -r "${ZIP_PATH}" "${MOCHAWESOME_DIR}" || echo "❌ ZIP creation failed"
-  echo "✅ ZIP created: ${ZIP_PATH} ($(ls -lh ${ZIP_PATH} 2>/dev/null | awk '{print $5}'))"
+  zip -r "${ZIP_PATH}" "${MOCHAWESOME_DIR}" || echo "ZIP creation failed"
+  echo "ZIP created: ${ZIP_PATH}"
 else
-  echo "❌ Mochawesome report folder not found: ${MOCHAWESOME_DIR}"
+  echo "Mochawesome report folder not found: ${MOCHAWESOME_DIR}"
 fi
 
 # Copy artifacts to shared volume for EC2 to upload
 mkdir -p /shared/test-logs
 if [ -f "${ZIP_PATH}" ]; then
-  echo "📁 Copying ZIP to shared volume: ${ZIP_NAME}"
-  cp "${ZIP_PATH}" "/shared/test-logs/${ZIP_NAME}" || echo "❌ Failed to copy ZIP to shared volume"
-else
-  echo "❌ No zip file to copy"
+  echo "Copying ZIP to shared volume: ${ZIP_NAME}"
+  cp "${ZIP_PATH}" "/shared/test-logs/${ZIP_NAME}" || echo "Failed to copy ZIP to shared volume"
 fi
 
-# Copy HTML report file to shared volume
 if [ -f "${REPORT_HTML}" ]; then
-  HTML_NAME=$(basename "$REPORT_HTML")
-  echo "📁 Copying HTML to shared volume: ${HTML_NAME}"
-  cp "${REPORT_HTML}" "/shared/test-logs/${HTML_NAME}" || echo "❌ Failed to copy HTML to shared volume"
-else
-  echo "❌ No HTML report found to copy"
+  echo "Copying HTML to shared volume: report.html"
+  cp "${REPORT_HTML}" "/shared/test-logs/report.html" || echo "Failed to copy HTML to shared volume"
 fi
 
-# Run result sync
-echo "🔄 Running syncCypressResults.js"
-PLAN_ID="${PLAN_ID}" RUN_ID="${RUN_ID}" TEST_ENVIRONMENT="${TEST_ENVIRONMENT}" node syncCypressResults.js >> results/logs.txt 2>&1 || echo "⚠️ syncCypressResults.js failed"
+# Copy raw mochawesome reports for EC2 host to upload
+if [ -d "${MOCHAWESOME_DIR}" ]; then
+  echo "Copying mochawesome reports to shared volume for EC2 upload..."
+  mkdir -p /shared/mochawesome-report
+  cp -r "${MOCHAWESOME_DIR}"/* /shared/mochawesome-report/ || echo "Failed to copy mochawesome reports"
+fi
 
-# Final output
-echo "📤 Dumping results/logs.txt for runner capture:"
-cat results/logs.txt || echo "❌ Failed to read results/logs.txt"
+# Post results to HAVEN API
+echo "Running syncCypressResults.js"
+PLAN_ID="${PLAN_ID}" RUN_ID="${RUN_ID}" TEST_ENVIRONMENT="${TEST_ENVIRONMENT}" node /haven/syncCypressResults.js "${MERGED_JSON}" || echo "Result sync script finished with warnings"
 
-exit $CYPRESS_EXIT_CODE
+exit $EXIT_CODE