itemengine-cypress-automation 1.0.519-dependabot-npm-and-yarn-multi-c7c3a225fc-be735c0.0 → 1.0.519

package/Dockerfile

@@ -28,7 +28,6 @@ RUN chmod +x ./deploy/resourcesAndToolsQuestion/run.sh
 RUN chmod +x ./deploy/audioResponseQuestion/run.sh
 RUN chmod +x ./deploy/dataApi/run.sh
 RUN chmod +x ./deploy/feedbackScaleQuestion/run.sh
-RUN chmod +x ./deploy/test/run.sh
 
 RUN npm ci
 

package/deploy/audioResponseQuestion/service.yaml

@@ -5,14 +5,12 @@ global:
     enabled: true
     highestEnvironment: dev
 
-  env:
-    - name: STAGE
-      value: "dev"
-
 deployment:
   activeDeadlineSeconds: 28800
   architecture: amd64
   restartPolicy: Never
+  parallelism: 7
+  completions: 7
   image:
     cmd: /ie-e2e/deploy/audioResponseQuestion/run.sh
     buildContext: ../..

package/il.yaml

@@ -11,6 +11,7 @@ otk:
     linuxDistribution: alpine
     language: node
     languageVersion: "20"
+    analysis: false
   deployables:
     - ./deploy/audioResponseQuestion/service.yaml
     # - ./deploy/DNDIntoCategoriesQuestion/service.yaml

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itemengine-cypress-automation",
-  "version": "1.0.519-dependabot-npm-and-yarn-multi-c7c3a225fc-be735c0.0",
+  "version": "1.0.519",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -39,12 +39,14 @@
   "dependencies": {
     "@cypress/grep": "^3.1.5",
     "axe-core": "^4.7.1",
+    "axios": "^1.12.2",
     "cy-verify-downloads": "^0.1.11",
     "cy2": "^4.0.9",
-    "cypress": "^15.2.0",
+    "cypress": "^12.17.2",
     "cypress-axe": "^1.4.0",
     "cypress-file-upload": "^5.0.8",
     "cypress-real-events": "^1.7.6",
+    "dotenv": "^17.2.2",
     "node-fetch": "^3.3.2",
     "react-uuid": "^2.0.0",
     "typescript": "^5.6.3"

package/scripts/run-status-check.mjs

@@ -0,0 +1,211 @@
+import axios from "axios";
+
+const sorryCypressTimeout = 1800000;
+const graphqlUrl = "https://cypress-api.imaginelearning.tech/";
+const projectId = "imaginelearning/itemengine-edgeex-cypress-automation";
+
+function getProjectId() {
+    return process.env.CYPRESS_PROJECT_ID || projectId;
+}
+
+function getRunsRequest() {
+    return {
+        operationName: "getRunsFeed",
+        variables: {
+            filters: [
+                {
+                    key: "meta.projectId",
+                    value: getProjectId(),
+                    like: null,
+                },
+            ],
+            cursor: "",
+        },
+        query:
+            "query getRunsFeed($cursor: String, $filters: [Filters!]!) {\n  runFeed(cursor: $cursor, filters: $filters) {\n    cursor\n    hasMore\n    runs {\n      runId\n      createdAt\n      completion {\n        ...RunSummaryCompletion\n        __typename\n      }\n      meta {\n        ...RunSummaryMeta\n        __typename\n      }\n      progress {\n        ...RunProgress\n        __typename\n      }\n      __typename\n    }\n    __typename\n  }\n}\n\nfragment RunSummaryCompletion on RunCompletion {\n  completed\n  inactivityTimeoutMs\n  __typename\n}\n\nfragment RunSummaryMeta on RunMeta {\n  ciBuildId\n  projectId\n  commit {\n    sha\n    branch\n    remoteOrigin\n    message\n    authorEmail\n    authorName\n    __typename\n  }\n  __typename\n}\n\nfragment RunProgress on RunProgress {\n  updatedAt\n  groups {\n    groupId\n    instances {\n      ...RunGroupProgressInstances\n      __typename\n    }\n    tests {\n      ...RunGroupProgressTests\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nfragment RunGroupProgressInstances on RunGroupProgressInstances {\n  overall\n  claimed\n  complete\n  failures\n  passes\n  __typename\n}\n\nfragment RunGroupProgressTests on RunGroupProgressTests {\n  overall\n  passes\n  failures\n  pending\n  skipped\n  flaky\n  __typename\n}\n",
+    };
+}
+
+function getRunDetailsRequest(runId) {
+    return {
+        operationName: "getRun",
+        variables: {
+            runId: runId,
+        },
+        query:
+            "query getRun($runId: ID!) {\n  run(id: $runId) {completion {\n      ...RunSummaryCompletion\n      __typename\n    }\n    meta {\n      ...RunSummaryMeta\n      __typename\n    }\n    specs {\n      ...RunDetailSpec\n      __typename\n    }\n    progress {\n      ...RunProgress\n      __typename\n    }\n    __typename\n  }\n}\n\nfragment RunSummaryCompletion on RunCompletion {\n  completed\n  inactivityTimeoutMs\n  __typename\n}\n\nfragment RunSummaryMeta on RunMeta {\n  ciBuildId\n  projectId\n  commit {\n    sha\n    branch\n    remoteOrigin\n    message\n    authorEmail\n    authorName\n    __typename\n  }\n  __typename\n}\n\nfragment RunDetailSpec on RunSpec {\n  instanceId\n  spec\n  claimedAt\n  machineId\n  groupId\n  results {\n    error\n    flaky\n    stats {\n      ...AllInstanceStats\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nfragment AllInstanceStats on InstanceStats {\n  suites\n  tests\n  pending\n  passes\n  failures\n  skipped\n  suites\n  wallClockDuration\n  wallClockStartedAt\n  wallClockEndedAt\n  __typename\n}\n\nfragment RunProgress on RunProgress {\n  updatedAt\n  groups {\n    groupId\n    instances {\n      ...RunGroupProgressInstances\n      __typename\n    }\n    tests {\n      ...RunGroupProgressTests\n      __typename\n    }\n    __typename\n  }\n  __typename\n}\n\nfragment RunGroupProgressInstances on RunGroupProgressInstances {\n  overall\n  claimed\n  complete\n  failures\n  passes\n  __typename\n}\n\nfragment RunGroupProgressTests on RunGroupProgressTests {\n  overall\n  passes\n  failures\n  pending\n  skipped\n  flaky\n  __typename\n}\n",
+    };
+}
+
+function sleep(ms) {
+    return new Promise((resolve) => setTimeout(resolve, ms));
+}
+
+async function getRuns(runName) {
+    const maxRetries = 1;
+    const retryDelay = 120000; // 2 mins
+    const projectId = getProjectId();
+    
+    console.log(`Searching for run ${runName} using project ID: ${projectId}`);
+    
+    for (let attempt = 0; attempt <= maxRetries; attempt++) {
+        try {
+            const response = await axios.post(graphqlUrl, getRunsRequest(), {
+                headers: { 'Content-Type': 'application/json' },
+                timeout: 30000
+            });
+            
+            const { data } = response;
+            
+            if (!data?.data?.runFeed?.runs) {
+                throw new Error(`Invalid API response structure: ${JSON.stringify(data)}`);
+            }
+            
+            const runs = data.data.runFeed.runs;
+            console.log(`Found ${runs.length} runs`);
+            
+            const run = runs.find(run => run.meta.ciBuildId === runName);
+            if (run) {
+                console.log(`Run ${runName} found with ID: ${run.runId}`);
+                return run;
+            }
+            
+            if (attempt < maxRetries) {
+                console.log(`Run not found, retrying in ${retryDelay/1000} seconds...`);
+                await sleep(retryDelay);
+            }
+        } catch (error) {
+            console.error(`API error (attempt ${attempt + 1}/${maxRetries + 1}): ${error.message}`);
+            
+            if (error.response) {
+                console.error(`Status: ${error.response.status}, Data:`, error.response.data);
+            }
+            
+            if (attempt < maxRetries) {
+                console.log(`Retrying in ${retryDelay/1000} seconds...`);
+                await sleep(retryDelay);
+            } else {
+                throw new Error(`Failed after ${maxRetries + 1} attempts: ${error.message}`);
+            }
+        }
+    }
+    
+    throw new Error(`Run ${runName} not found after ${maxRetries + 1} attempts`);
+}
+
+//Action starts here
+export async function checkRunStatus(runName) {
+    try {
+        console.log(`Looking for run ${runName}`);
+        
+        // Get run details
+        const run = await getRuns(runName);
+        const runId = run.runId;
+        console.log(`RunId found: ${runId}`);
+
+        // Wait for run to complete
+        await waitForRunCompletion(runId);
+        
+        // Get final run details to check results
+        const runDetails = await getRunDetails(runId);
+        
+        // Determine result
+        if (runDetails.data.run.completion.inactivityTimeoutMs >= sorryCypressTimeout) {
+            console.log(`Run ${runName} has timed out. Considering it as failed`);
+            return 1;
+        } 
+        
+        if (runDetails.data.run.progress.groups[0].tests.failures > 0) {
+            console.log(`Some tests in the run ${runName} have failed. Considering it as failed`);
+            return 1;
+        }
+        
+        console.log(`No tests have failed in the run ${runName}. Considering it as successful`);
+        return 0;
+    } catch (error) {
+        console.error('Error checking run status:', error);
+        return 1;
+    }
+}
+
+async function getRunDetails(runId) {
+    try {
+        const response = await axios.post(graphqlUrl, getRunDetailsRequest(runId), {
+            headers: { 'Content-Type': 'application/json' },
+            timeout: 30000
+        });
+        
+        const { data } = response;
+        
+        if (!data?.data?.run) {
+            throw new Error(`Invalid run details response: ${JSON.stringify(data)}`);
+        }
+        
+        return data;
+    } catch (error) {
+        console.error(`Failed to get run details: ${error.message}`);
+        if (error.response) {
+            console.error(`Status: ${error.response.status}, Data:`, error.response.data);
+        }
+        throw error;
+    }
+}
+
+async function waitForRunCompletion(runId) {
+    const checkInterval = 15000; // 15 seconds
+    const maxRetries = 5;
+    let isRunFinished = false;
+    let consecutiveErrors = 0;
+    
+    console.log(`Waiting for run ${runId} to complete...`);
+    
+    while (!isRunFinished) {
+        try {
+            const runDetails = await getRunDetails(runId);
+            const run = runDetails.data.run;
+            
+            // Check if the run has timed out
+            if (run.completion.inactivityTimeoutMs >= sorryCypressTimeout) {
+                console.log('Run has timed out, marking as finished');
+                return;
+            }
+            
+            // Check if run has progress data
+            if (run.progress?.groups?.length > 0) {
+                const group = run.progress.groups[0];
+                
+                if (!group.instances) {
+                    console.log('Missing instances in group, waiting...');
+                    await sleep(checkInterval);
+                    continue;
+                }
+                
+                // Check if all instances are complete
+                isRunFinished = group.instances.overall === group.instances.complete;
+                console.log(`Run progress: ${group.instances.complete}/${group.instances.overall} complete`);
+                
+                if (isRunFinished) {
+                    console.log('Run is complete');
+                    return;
+                }
+            } else {
+                console.log('Run has no progress groups yet, waiting...');
+            }
+            
+            // Reset error counter on successful API call
+            consecutiveErrors = 0;
+            await sleep(checkInterval);
+            
+        } catch (error) {
+            consecutiveErrors++;
+            console.error(`Error checking run status (error ${consecutiveErrors}/${maxRetries}): ${error.message}`);
+            
+            if (consecutiveErrors >= maxRetries) {
+                throw new Error(`Maximum retries reached: ${error.message}`);
+            }
+            
+            await sleep(checkInterval);
+        }
+    }
+}
+

package/scripts/sorry-cypress.mjs

@@ -2,6 +2,7 @@ import { execSync } from "child_process";
 import * as OS from "os";
 import fetch from "node-fetch";
 import { getS3Object } from "./awsHelper.mjs";
+import { checkRunStatus } from "./run-status-check";
 
 let ciBuildId;
 let startTime;
@@ -239,9 +240,10 @@ export async function runSorryCypressLocalMigration() {
 }
 
 // Functions to execute cypress tests specific to Question Types
-export function runSorryCypressQuestions() {
+export async function runSorryCypressQuestions() {
     process.env.CYPRESS_API_URL = "https://cypress-director.imaginelearning.tech/";
     const user = OS.userInfo().username;
+    const isOtkv2 = process.env.OTK_VERSION === '2';
     startTime = Math.round(Date.now() / 1000000);
     ciBuildId = setCiBuildId(user, startTime);
 
@@ -265,6 +267,10 @@ export function runSorryCypressQuestions() {
     console.log(`Running Command: ${command}`);
     try {
         execSync(command, {stdio: "inherit"});
+        if (isOtkv2) {
+            const status = await checkRunStatus(ciBuildId);
+            process.exit(status);
+        }
     } catch (error) {
         console.error("One or more tests failed to pass, OR an error occurred during run");
         console.error("Cypress run error details:", {