itemengine-cypress-automation 1.0.524-dependabot-npm-and-yarn-multi-92087b3b2d-7ea5cae.0 → 1.0.524

package/Dockerfile

@@ -28,6 +28,7 @@ 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 ./run.sh
 
 RUN npm ci
 

package/il.yaml

@@ -13,22 +13,7 @@ otk:
     languageVersion: "20"
     analysis: false
   deployables:
-    - ./deploy/audioResponseQuestion/service.yaml
-    - ./deploy/DNDIntoCategoriesQuestion/service.yaml
-    - ./deploy/dataApi/service.yaml
-    - ./deploy/e2e/service.yaml
-    - ./deploy/essayQuestion/service.yaml
-    - ./deploy/feedbackScaleQuestion/service.yaml
-    - ./deploy/fillInTheGapsQuestion/service.yaml
-    - ./deploy/graphingQuestion/service.yaml
-    - ./deploy/imageHighlightQuestion/service.yaml
-    - ./deploy/listOrderingQuestion/service.yaml
-    - ./deploy/migration/service.yaml
-    - ./deploy/multipleSelectionQuestion/service.yaml
-    - ./deploy/resourcesAndToolsQuestion/service.yaml
-    - ./deploy/smoke/service.yaml
-    - ./deploy/textEntryMathQuestion/service.yaml
-    - ./deploy/thinkSphere/service.yaml
+    - ./service.yaml
   deployConfig:
     environments:
       - dev

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "itemengine-cypress-automation",
-  "version": "1.0.524-dependabot-npm-and-yarn-multi-92087b3b2d-7ea5cae.0",
+  "version": "1.0.524",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -42,7 +42,7 @@
     "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",

package/run.sh

@@ -0,0 +1,2 @@
+#!/bin/sh
+echo "Running integration test"

package/scripts/run-status-check.mjs

@@ -2,7 +2,7 @@ import axios from "axios";
 
 const sorryCypressTimeout = 1800000;
 const graphqlUrl = "https://cypress-api.imaginelearning.tech/";
-const projectId = "imaginelearning/itemengine-edgeex-cypress-automation";
+const projectId = "imaginelearning/itemengine-cypress-automation";
 
 function getProjectId() {
     return process.env.CYPRESS_PROJECT_ID || projectId;

package/scripts/sorry-cypress.mjs

@@ -158,7 +158,7 @@ export function runSorryCypressLocal() {
 /**
  * @method runSorryCypressSpinnaker
  */
-export function runSorryCypressSpinnaker() {
+export async function runSorryCypressSpinnaker() {
     console.log('Inside runSorryCypressSpinnaker');
     process.env.CYPRESS_API_URL = "https://cypress-director.imaginelearning.tech/";
     console.log('CYPRESS_API_URL:', process.env.CYPRESS_API_URL);
@@ -168,9 +168,28 @@ export function runSorryCypressSpinnaker() {
     console.log('ciBuildId:', ciBuildId);
     const envArgs = setCommandLineEnvArgs()
     console.log('envArgs:', envArgs);
+    const isOtkv2 = process.env.OTK_VERSION === '2';
     let command = `cy2 run --parallel --browser chrome --record --key imaginelearning/itemengine-cypress-automation --ci-build-id ${ciBuildId} ${envArgs} --spec "cypress/e2e/ILC/**/*.js"`;
     console.log(`command: ${command}`);
-    execSync(command, { stdio: "inherit" });
+    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:", {
+            status: error.status,
+            message: error.message,
+            stack: error.stack
+        });
+
+        console.log("Exiting process with code: 1");
+        process.exit(1);
+    }
+    console.log("Cypress tests all passed successfully. Exiting process with code: 0");
+    process.exit(0);
 }
 
 /**

package/service.yaml

@@ -0,0 +1,80 @@
+global:
+  name: ie-cypress
+  type: test
+  autoDeploy:
+    enabled: true
+    highestEnvironment: staging
+
+deployment:
+  activeDeadlineSeconds: 28800
+  architecture: amd64
+  restartPolicy: Never
+  backoffLimit: 0
+  parallelism: 7
+  completions: 7
+  image:
+    cmd: /ie-e2e/run.sh
+  resources:
+    limits:
+      memory: 8446Mi
+      cpu: 5000m
+    requests:
+      memory: 4096Mi
+      cpu: 2000m
+  egress:
+    FQDNs:
+      - "*.content-nonprod.imaginelearning.com"
+      - "*.cloudflare.com"
+      - "*.googleapis.com"
+      - "www.desmos.com"
+      - "*.google.com"
+      - "*.*.google.com"
+      - "google-ohttp-relay-safebrowsing.fastly-edge.com"
+      - "*.gstatic.com"
+      - "*.codecogs.com"
+      - "cypress-director.imaginelearning.tech"
+      - "cypress-api.imaginelearning.tech"
+      - "*.cypress.io"
+      - "*.*.mozilla.com"
+      - "*.*.*.mozilla.com"
+  env:
+    - name: OTK_VERSION
+      value: "2"
+    - name: CYPRESS_API_URL
+      value: "https://cypress-director.imaginelearning.tech/"
+    - name: THEME
+      value: "ilc"
+    - name: GREP_TAGS
+      value: ""
+    - name: GREP_UNTAGGED
+      value: ""
+    - name: SPEC_PATTERN
+      value: ""
+    - name: QUESTION_TYPE
+      value: "AudioResponseNew_VideoResponseNew_UploadResponse_ToolAudioPlayerNew"
+  
+namespaces:
+  dev:
+    env:
+      - name: STAGE
+        value: "dev"
+      - name: FILE_CONFIG
+        value: "dev"
+  qa:
+    env:
+      - name: STAGE
+        value: "qa"
+      - name: FILE_CONFIG
+        value: "qa"
+  staging:
+    env:
+      - name: STAGE
+        value: "stage"
+      - name: FILE_CONFIG
+        value: "stage"
+  prod:
+    env:
+      - name: STAGE
+        value: "prod"
+      - name: FILE_CONFIG
+        value: "prod"