upgrade cypress, edit workflow

cisagov · Nov 15, 2022 · 5274cc2 · 5274cc2
1 parent c668831
commit 5274cc2
Show file tree

Hide file tree

Showing 8 changed files with 43 additions and 30 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -16,7 +16,21 @@ on:
    - '**'
 
 jobs:
+
+ prepare:
+  runs-on: ubuntu-20.04
+  outputs:
+   uuid: ${{ steps.uuid.outputs.value }}
+  steps:
+   - name: Generate unique ID 💎
+     id: uuid
+      run: echo "{name}={sha-$GITHUB_SHA-time-$(date +"%s")}" >> $GITHUB_ENV
+
+   - name: Print unique ID 🖨`
+     run: echo "generated id ${{ steps.uuid.outputs.value }}"
+
  install:
+  needs: ['prepare']
   runs-on: ubuntu-latest
   steps:
    - name: Checkout
@@ -40,7 +54,7 @@ jobs:
   runs-on: ubuntu-latest
   container:
    image: cypress/browsers:node18.12.0-chrome106-ff106
-  needs: install
+  needs: [prepare, install]
   strategy:
    fail-fast: false
    matrix:
@@ -74,17 +88,17 @@ jobs:
       parallel: true
       config-file: cypress.config.js
       spec: src/integration/e2e/redteam/**/**/**/*.cy.js
+      ci-build-id: ${{ needs.prepare.outputs.uuid }}
      env:
       CYPRESS_PROJECT_ID: 'rsybgk'
-      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY_RED }}
 
  RedTeamFirefox:
   runs-on: ubuntu-latest
   container:
    image: cypress/browsers:node18.12.0-chrome106-ff106
    options: --user 1001
-  needs: install
+  needs: [prepare, install]
   strategy:
    fail-fast: false
    matrix:
@@ -117,21 +131,21 @@ jobs:
       parallel: true
       config-file: cypress.config.js
       spec: src/integration/e2e/redteam/**/**/**/*.cy.js
+      ci-build-id: ${{ needs.prepare.outputs.uuid }}
      env:
       CYPRESS_PROJECT_ID: 'rsybgk'
-      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY_RED1 }}
 
  BlueTeamChrome:
   runs-on: ubuntu-latest
   container:
    image: cypress/browsers:node18.12.0-chrome106-ff106
    options: --user 1001
-  needs: install
+  needs: [prepare, install]
   strategy:
    fail-fast: false
    matrix:
-    containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12]
+    containers: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10]
   steps:
    - name: Checkout
      uses: actions/checkout@v3
@@ -160,17 +174,17 @@ jobs:
       parallel: true
       config-file: cypress.config.js
       spec: src/integration/e2e/blueteam/**/*.cy.js
+      ci-build-id: ${{ needs.prepare.outputs.uuid }}
      env:
-      CYPRESS_PROJECT_ID: 'rsybgk'
-      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      CYPRESS_PROJECT_ID: '46ahz3'
+      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY_BLUE }}
 
  BlueTeamFirefox:
   runs-on: ubuntu-latest
   container:
    image: cypress/browsers:node18.12.0-chrome106-ff106
    options: --user 1001
-  needs: install
+  needs: [prepare, install]
   strategy:
    fail-fast: false
    matrix:
@@ -203,7 +217,7 @@ jobs:
       parallel: true
       config-file: cypress.config.js
       spec: src/integration/e2e/blueteam/**/*.cy.js
+      ci-build-id: ${{ needs.prepare.outputs.uuid }}
      env:
-      CYPRESS_PROJECT_ID: 'rsybgk'
-      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY }}
-      GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      CYPRESS_PROJECT_ID: '46ahz3'
+      CYPRESS_RECORD_KEY: ${{ secrets.CYPRESS_RECORD_KEY_BLUE1 }}
diff --git a/applications/redeye-e2e/cypress.config.js b/applications/redeye-e2e/cypress.config.js
@@ -1,7 +1,6 @@
 const { defineConfig } = require('cypress');
 
 module.exports = defineConfig({
-	projectId: 'rsybgk',
 	fixturesFolder: './src/fixtures',
 	modifyObstructiveCode: false,
 	video: false,

diff --git a/applications/redeye-e2e/src/integration/e2e/blueteam/select-beacon.cy.js b/applications/redeye-e2e/src/integration/e2e/blueteam/select-beacon.cy.js
@@ -13,7 +13,7 @@ describe('Selecting Host Via Graph', () => {
 			//Host Win-10-02
 			cy.get('[cy-test=graphNode]').eq(2).click({ force: true });
 
-			cy.wait(500);
+			cy.wait(1000);
 
 			cy.get('[cy-test=header]').should('contain.text', 'COMPUTER03');
 
@@ -24,7 +24,7 @@ describe('Selecting Host Via Graph', () => {
 		if (Cypress.isBrowser('firefox')) {
 			cy.get('[cy-test=graphNode]').eq(1).click({ force: true });
 
-			cy.wait(500);
+			cy.wait(1000);
 
 			cy.get('[cy-test=header]').should('contain.text', 'COMPUTER03');
 

diff --git a/applications/redeye-e2e/src/integration/e2e/blueteam/select-host.cy.js b/applications/redeye-e2e/src/integration/e2e/blueteam/select-host.cy.js
@@ -12,7 +12,7 @@ describe('Testing of graph', () => {
 		if (Cypress.isBrowser({ family: 'chromium' })) {
 			cy.get('[cy-test=graphNode]').eq(1).click({ force: true });
 
-			cy.wait(500);
+			cy.wait(1000);
 
 			cy.get('[cy-test=header]').should('contain.text', 'COMPUTER02');
 
@@ -24,7 +24,7 @@ describe('Testing of graph', () => {
 		if (Cypress.isBrowser('firefox')) {
 			cy.get('[cy-test=graphNode]').eq(0).click({ force: true });
 
-			cy.wait(500);
+			cy.wait(1000);
 
 			cy.get('[cy-test=header]').should('contain.text', 'COMPUTER02');
 

diff --git a/applications/redeye-e2e/src/integration/e2e/redteam/select-beacon.cy.js b/applications/redeye-e2e/src/integration/e2e/redteam/select-beacon.cy.js
@@ -13,7 +13,7 @@ describe('Selecting Host Via Graph', () => {
 			//Host Win-10-02
 			cy.get('[cy-test=graphNode]').eq(2).click({ force: true });
 
-			cy.wait(500);
+			cy.wait(1000);
 
 			cy.get('[cy-test=header]').should('contain.text', 'COMPUTER03');
 
@@ -24,7 +24,7 @@ describe('Selecting Host Via Graph', () => {
 		if (Cypress.isBrowser('firefox')) {
 			cy.get('[cy-test=graphNode]').eq(1).click({ force: true });
 
-			cy.wait(500);
+			cy.wait(1000);
 
 			cy.get('[cy-test=header]').should('contain.text', 'COMPUTER03');
 

diff --git a/applications/redeye-e2e/src/integration/e2e/redteam/select-host.cy.js b/applications/redeye-e2e/src/integration/e2e/redteam/select-host.cy.js
@@ -12,7 +12,7 @@ describe('Testing of graph', () => {
 		if (Cypress.isBrowser({ family: 'chromium' })) {
 			cy.get('[cy-test=graphNode]').eq(1).click({ force: true });
 
-			cy.wait(500);
+			cy.wait(1000);
 
 			cy.get('[cy-test=header]').should('contain.text', 'COMPUTER02');
 
@@ -24,7 +24,7 @@ describe('Testing of graph', () => {
 		if (Cypress.isBrowser('firefox')) {
 			cy.get('[cy-test=graphNode]').eq(0).click({ force: true });
 
-			cy.wait(500);
+			cy.wait(1000);
 
 			cy.get('[cy-test=header]').should('contain.text', 'COMPUTER02');
 

diff --git a/package.json b/package.json
@@ -154,7 +154,7 @@
 		"barrelsby": "^2.3.0",
 		"builder-util": "^23.0.2",
 		"cross-env": "^7.0.3",
-		"cypress": "^11.0.1",
+		"cypress": "^11.1.0",
 		"cypress-multi-reporters": "^1.6.1",
 		"dotenv": "^8.2.0",
 		"eslint": "^8.22.0",

diff --git a/yarn.lock b/yarn.lock
@@ -8319,9 +8319,9 @@ __metadata:
   languageName: node
   linkType: hard
 
-"cypress@npm:^11.0.1":
-  version: 11.0.1
-  resolution: "cypress@npm:11.0.1"
+"cypress@npm:^11.1.0":
+  version: 11.1.0
+  resolution: "cypress@npm:11.1.0"
   dependencies:
     "@cypress/request": ^2.88.10
     "@cypress/xvfb": ^1.2.4
@@ -8367,7 +8367,7 @@ __metadata:
     yauzl: ^2.10.0
   bin:
     cypress: bin/cypress
-  checksum: 417763449c0688d45506eb492431c87d9fbc3ce6e0690c386533b2319081cf9c41672ce6f35c056fccf2aa045bf9592c46349d3d508908d188f65c4f43069c54
+  checksum: ee0097778cf3cdf3854325cabf19a60a7486d46ae70082034c05b22b203f21ff85a4871c08dadc6641be649a64c739a443dd3f2d6a5ab112fc9ead703e1f1be3
   languageName: node
   linkType: hard
 
@@ -17065,7 +17065,7 @@ __metadata:
     cors: ^2.8.5
     cross-env: ^7.0.3
     crypto-js: ^4.0.0
-    cypress: ^11.0.1
+    cypress: ^11.1.0
     cypress-multi-reporters: ^1.6.1
     d3: ^6.7.0
     dotenv: ^8.2.0