haven-cypress-integration 1.6.0 → 1.6.2

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

@@ -38,7 +38,7 @@ class HavenCypressIntegration {
 
       // Build Docker image
       console.log('🏗️ Building Docker image...');
-      execSync(`docker build -t ${tag} .`, {
+      execSync(`podman build -t ${tag} .`, {
         cwd: buildDir,
         stdio: 'inherit'
       });
@@ -191,16 +191,16 @@ class HavenCypressIntegration {
 
       // Login to ECR
       console.log('🔐 Logging in to ECR...');
-      const loginCmd = `aws ecr get-login-password --region ${region} | docker login --username AWS --password-stdin ${ecrUri}`;
+      const loginCmd = `aws ecr get-login-password --region ${region} | podman login --username AWS --password-stdin ${ecrUri}`;
       execSync(loginCmd, { stdio: 'inherit' });
 
       // Tag image for ECR
       console.log(`🏷️  Tagging image: ${localTag} -> ${fullEcrUri}`);
-      execSync(`docker tag ${localTag} ${fullEcrUri}`, { stdio: 'inherit' });
+      execSync(`podman tag ${localTag} ${fullEcrUri}`, { stdio: 'inherit' });
 
       // Push to ECR
       console.log(`📤 Pushing to ECR: ${fullEcrUri}`);
-      execSync(`docker push ${fullEcrUri}`, { stdio: 'inherit' });
+      execSync(`podman push ${fullEcrUri}`, { stdio: 'inherit' });
 
       console.log(`✅ Image pushed successfully!`);
       console.log(`📍 ECR URI: ${fullEcrUri}`);
@@ -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.6.0",
+  "version": "1.6.2",
   "description": "Seamless Cypress integration with HAVEN test case management",
   "main": "index.js",
   "bin": {
@@ -23,4 +23,4 @@
   "engines": {
     "node": ">=14.0.0"
   }
-}
+}

package/templates/Dockerfile

@@ -5,15 +5,20 @@ WORKDIR /app
 # Copy project files
 COPY . .
 
-# Install zip utility (AWS CLI removed - EC2 handles S3 uploads)
+# ✅ Install zip and AWS CLI v2 via official method
 RUN apt-get update && \
-    apt-get install -y zip && \
-    apt-get clean && \
-    rm -rf /var/lib/apt/lists/*
+    apt-get install -y \
+    zip \
+    unzip \
+    curl && \
+    curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" -o "awscliv2.zip" && \
+    unzip awscliv2.zip && \
+    ./aws/install && \
+    rm -rf aws awscliv2.zip
 
 # ✅ Install Node deps (including dev dependencies for mochawesome)
 RUN npm ci --include=dev
-RUN npm install --no-save mochawesome mochawesome-merge mochawesome-report-generator
+RUN npm install --no-save aws-sdk mochawesome mochawesome-merge mochawesome-report-generator
 
 # ✅ Ensure script is executable
 COPY run-filtered.sh /app/run-filtered.sh

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"
 
@@ -128,7 +154,7 @@ 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

@@ -112,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,
@@ -154,7 +156,7 @@ 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');
 
@@ -164,6 +166,7 @@ async function postSummary(results, notFound, planId, runId) {
   const summaryPayload = {
     runId,
     planId,
+    environment: testEnvironment,
     status: computeOverallStatus(results, notFound),
     logs,
     result: {