haven-cypress-integration 1.5.0 → 1.6.1

package/bin/haven-cypress.js

@@ -19,13 +19,16 @@ Options:
   --tag=name:version    Docker image tag (default: haven-cypress-tests:latest)
   --product=name        Product name for ECR organization (required for --push)
   --push                Push image to ECR haven-test-images repository
-  --automationIds=ID1,ID2  Run specific test cases
+  --automationIds=ID1,ID2  Run specific test cases by automation ID
+  --customTags=tag1,tag2   Run tests with custom tags (smoke, regression, p1, etc.)
 
 Examples:
   npx haven-cypress build --product=BE
   npx haven-cypress build --product=BE --push
   npx haven-cypress build --product=BE --tag=v2.1.0 --push
   npx haven-cypress run --automationIds=TC-AUTO-123,TC-AUTO-124
+  npx haven-cypress run --customTags=smoke,p1
+  npx haven-cypress run --automationIds=TC-AUTO-123 --customTags=smoke
 
 Versioning:
   --tag=latest        → ECR tag: BE-{package.json.version} or BE-1.0.{BUILD_NUMBER}
@@ -60,7 +63,8 @@ try {
 
     case 'run':
       const automationIds = options.automationIds || '';
-      integration.runTests(automationIds);
+      const customTags = options.customTags || '';
+      integration.runTests(automationIds, customTags);
       break;
 
     default:

package/index.js

@@ -217,9 +217,10 @@ class HavenCypressIntegration {
    * Run tests with Haven integration
    * This is called by Haven when the container runs
    */
-  runTests(automationIds = '') {
+  runTests(automationIds = '', customTags = '') {
     console.log('🧪 Running Haven-integrated Cypress tests...');
-    console.log(`🔍 Automation IDs: ${automationIds || 'All tests'}`);
+    console.log(`🔍 Automation IDs: ${automationIds || 'None'}`);
+    console.log(`🔍 Custom Tags: ${customTags || 'None'}`);
 
     // This will be handled by run-filtered.sh when container runs
     // The library just provides the interface

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "haven-cypress-integration",
-  "version": "1.5.0",
+  "version": "1.6.1",
   "description": "Seamless Cypress integration with HAVEN test case management",
   "main": "index.js",
   "bin": {

package/templates/run-filtered.sh

@@ -4,31 +4,56 @@ echo "🔥 RUN SCRIPT:"
 echo "✅ ENTERED run-filtered.sh"
 echo "⚙️ Raw args: $@"
 
-# Extract automation IDs from CLI args
+# Extract automation IDs and custom tags from CLI args
 AUTOMATION_IDS=""
+CUSTOM_TAGS=""
 for arg in "$@"; do
   case $arg in
     --automationIds=*)
       AUTOMATION_IDS="${arg#*=}"
       shift
       ;;
+    --customTags=*)
+      CUSTOM_TAGS="${arg#*=}"
+      shift
+      ;;
   esac
 done
 
 echo "🔍 Extracted automation IDs: ${AUTOMATION_IDS}"
+echo "🔍 Extracted custom tags: ${CUSTOM_TAGS}"
 echo "📂 Current working directory: $(pwd)"
 
+# Build grep arguments for Cypress
+CYPRESS_GREP=""
+GREP_TAGS=""
 
-if [ -z "$AUTOMATION_IDS" ]; then
-  echo "🔁 No automation IDs provided. Running all tests..."
-  CYPRESS_GREP=""
-else
+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}"
+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//,/ }"
+  
+  if [ -n "$GREP_TAGS" ]; then
+    GREP_TAGS="${GREP_TAGS} ${CLEANED_TAGS}"
+  else
+    GREP_TAGS="${CLEANED_TAGS}"
+  fi
+  echo "🚀 Running Cypress with custom tags: ${CLEANED_TAGS}"
+fi
 
-  echo "🚀 Running Cypress with filtered tags: ${CLEANED_IDS}"
-  CYPRESS_GREP="--env grepTags='${CLEANED_IDS}'"
+if [ -n "$GREP_TAGS" ]; then
+  CYPRESS_GREP="--env grepTags='${GREP_TAGS}'"
+  echo "💡 Final grep tags: ${GREP_TAGS}"
+else
+  echo "🔁 No tags provided. Running all tests..."
 fi
 
 # Set environment variables
@@ -37,6 +62,7 @@ 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}
 
 # Ensure results directory exists
 mkdir -p results/mochawesome
@@ -45,14 +71,14 @@ echo "🧹 Cleaning mochawesome reports"
 rm -rf results/mochawesome/*
 
 # Run Cypress
-echo "🚀 Running Cypress with filtered tags: ${AUTOMATION_IDS}"
+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 \
+  --env grepFilterSpecs=true,grepUntagged=false,grepEnabled=true,TEST_ENVIRONMENT=${TEST_ENVIRONMENT} \
   $CYPRESS_GREP \
   > results/logs.txt 2>&1"
 
@@ -108,29 +134,27 @@ else
   echo "❌ Mochawesome report folder not found: ${MOCHAWESOME_DIR}"
 fi
 
-# Upload zipped report to S3
+# Copy artifacts to shared volume for EC2 to upload
+mkdir -p /shared/test-logs
 if [ -f "${ZIP_PATH}" ]; then
-  S3_BASE_KEY="artifacts/${PRODUCT_NAME}/${PLAN_ID}/automation/${RUN_ID}"
-  S3_ZIP_KEY="${S3_BASE_KEY}/${ZIP_NAME}"
-  echo "☁️ Uploading ZIP to s3://${BUCKET_NAME}/${S3_ZIP_KEY}"
-  aws s3 cp "${ZIP_PATH}" "s3://${BUCKET_NAME}/${S3_ZIP_KEY}" || echo "❌ S3 ZIP upload failed"
+  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 upload"
+  echo "❌ No zip file to copy"
 fi
 
-# Upload HTML report file to S3
+# Copy HTML report file to shared volume
 if [ -f "${REPORT_HTML}" ]; then
   HTML_NAME=$(basename "$REPORT_HTML")
-  S3_HTML_KEY="${S3_BASE_KEY}/${HTML_NAME}"
-  echo "🌐 Uploading HTML to s3://${BUCKET_NAME}/${S3_HTML_KEY}"
-  aws s3 cp "${REPORT_HTML}" "s3://${BUCKET_NAME}/${S3_HTML_KEY}" || echo "❌ S3 HTML upload failed"
+  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 upload"
+  echo "❌ No HTML report found to copy"
 fi
 
 # Run result sync
 echo "🔄 Running syncCypressResults.js"
-PLAN_ID="${PLAN_ID}" RUN_ID="${RUN_ID}" node syncCypressResults.js >> results/logs.txt 2>&1 || echo "⚠️ syncCypressResults.js failed"
+PLAN_ID="${PLAN_ID}" RUN_ID="${RUN_ID}" TEST_ENVIRONMENT="${TEST_ENVIRONMENT}" node syncCypressResults.js >> results/logs.txt 2>&1 || echo "⚠️ syncCypressResults.js failed"
 
 # Final output
 echo "📤 Dumping results/logs.txt for runner capture:"

package/templates/syncCypressResults.js

@@ -2,13 +2,7 @@ const fs = require("fs");
 const path = require("path");
 const axios = require("axios");
 const glob = require("glob");
-const AWS = require("aws-sdk");
-
-// AWS setup
-const s3 = new AWS.S3({
-  region: process.env.AWS_REGION || "us-east-1",
-});
-const bucketName = process.env.S3_BUCKET || "your-bucket-name";
+// AWS SDK removed - EC2 instance handles S3 uploads
 
 // Paths
 const automationCasesPath = "/shared/automation-cases.json";
@@ -118,23 +112,25 @@ try {
 
   const planId = process.env.PLAN_ID || "unknown";
   const runId = process.env.RUN_ID || "unknown";
+  const testEnvironment = process.env.TEST_ENVIRONMENT || "QA";
 
   if (!planId || !runId || isNaN(Number(planId)) || isNaN(Number(runId))) {
     console.error("❌ Invalid or missing PLAN_ID / RUN_ID");
     process.exit(1);
   }
 
-  await postResults(formatted, notFound, planId, runId);
-  await postSummary(formatted, notFound, planId, runId);
+  await postResults(formatted, notFound, planId, runId, testEnvironment);
+  await postSummary(formatted, notFound, planId, runId, testEnvironment);
 })();
 
-async function postResults(formattedResults, notFoundList, planId, runId) {
+async function postResults(formattedResults, notFoundList, planId, runId, testEnvironment) {
   const postUrl = baseUrl; // baseUrl already includes the complete endpoint
   console.log(`🔗 Posting to URL: ${postUrl}`);
 
   const payload = {
     planId,
     runId,
+    environment: testEnvironment,
     results: formattedResults,
     not_found: notFoundList,
     triggered_by: triggeredBy,
@@ -160,16 +156,17 @@ async function postResults(formattedResults, notFoundList, planId, runId) {
   }
 }
 
-async function postSummary(results, notFound, planId, runId) {
+async function postSummary(results, notFound, planId, runId, testEnvironment) {
   // Replace test-results with test-run-summary in the baseUrl
   const url = baseUrl.replace('/api/test-results', '/api/test-run-summary');
 
   const logs =
-    (await uploadLogToS3(planId, runId)) || "Log upload failed or missing";
+    (await copyLogToShared(planId, runId)) || "Log copy failed or missing";
 
   const summaryPayload = {
     runId,
     planId,
+    environment: testEnvironment,
     status: computeOverallStatus(results, notFound),
     logs,
     result: {
@@ -197,30 +194,26 @@ async function postSummary(results, notFound, planId, runId) {
   }
 }
 
-async function uploadLogToS3(planId, runId) {
+async function copyLogToShared(planId, runId) {
   const logsPath = "results/logs.txt";
 
   if (!fs.existsSync(logsPath)) {
-    console.warn("⚠️ No logs.txt file found to upload.");
+    console.warn("⚠️ No logs.txt file found to copy.");
     return null;
   }
 
-  const key = `artifacts/${process.env.PRODUCT_NAME}/${planId}/automation/${runId}/run_log`;
-  const fileStream = fs.createReadStream(logsPath);
+  const sharedDir = "/shared/test-logs";
+  if (!fs.existsSync(sharedDir)) {
+    fs.mkdirSync(sharedDir, { recursive: true });
+  }
 
   try {
-    await s3
-      .upload({
-        Bucket: bucketName,
-        Key: key,
-        Body: fileStream,
-        ContentType: "text/plain",
-      })
-      .promise();
-
-    return `s3://${bucketName}/${key}`;
+    const destPath = path.join(sharedDir, "run_log.txt");
+    fs.copyFileSync(logsPath, destPath);
+    console.log(`📁 Logs copied to shared volume: ${destPath}`);
+    return destPath;
   } catch (err) {
-    console.error("❌ Failed to upload log to S3:", err.message);
+    console.error("❌ Failed to copy log to shared volume:", err.message);
     return null;
   }
 }