diff --git a/.github/workflows/ci-test-custom-script.yml b/.github/workflows/ci-test-custom-script.yml index 3f36b3e26749..cc67dddb0ed1 100644 --- a/.github/workflows/ci-test-custom-script.yml +++ b/.github/workflows/ci-test-custom-script.yml @@ -371,6 +371,7 @@ jobs: CYPRESS_SNOWFLAKE_USERNAME: ${{ secrets.SNOWFLAKE_USERNAME }} CYPRESS_SNOWFLAKE_PASSWORD: ${{ secrets.SNOWFLAKE_PASSWORD }} NODE_ENV: development + GITHUB_WORKFLOW : ${{ github.workflow }} run: | cd app/client ls -la diff --git a/.github/workflows/ci-test-hosted.yml b/.github/workflows/ci-test-hosted.yml index 0cc0420b13e9..48eed24385d1 100644 --- a/.github/workflows/ci-test-hosted.yml +++ b/.github/workflows/ci-test-hosted.yml @@ -248,6 +248,7 @@ jobs: CYPRESS_SNOWFLAKE_USERNAME: ${{ secrets.SNOWFLAKE_USERNAME }} CYPRESS_SNOWFLAKE_PASSWORD: ${{ secrets.SNOWFLAKE_PASSWORD }} NODE_ENV: development + GITHUB_WORKFLOW : ${{ github.workflow }} run: | cd app/client npx cypress-repeat-pro run -n 3 --rerun-failed-only \ diff --git a/.github/workflows/ci-test-limited-with-count.yml b/.github/workflows/ci-test-limited-with-count.yml index 86be98b2a3b0..2faf3943fbee 100644 --- a/.github/workflows/ci-test-limited-with-count.yml +++ b/.github/workflows/ci-test-limited-with-count.yml @@ -427,6 +427,7 @@ jobs: CYPRESS_SNOWFLAKE_USERNAME: ${{ secrets.SNOWFLAKE_USERNAME }} CYPRESS_SNOWFLAKE_PASSWORD: ${{ secrets.SNOWFLAKE_PASSWORD }} NODE_ENV: development + GITHUB_WORKFLOW : ${{ github.workflow }} run: | cd app/client if [[ "${{ inputs.update_snapshot }}" == "true" ]]; then diff --git a/.github/workflows/ci-test-limited.yml b/.github/workflows/ci-test-limited.yml index a5a49af7a1b7..da0343642d43 100644 --- a/.github/workflows/ci-test-limited.yml +++ b/.github/workflows/ci-test-limited.yml @@ -342,6 +342,7 @@ jobs: CYPRESS_SNOWFLAKE_ACCOUNT_NAME: ${{ secrets.SNOWFLAKE_ACCOUNT_NAME }} CYPRESS_SNOWFLAKE_USERNAME: ${{ secrets.SNOWFLAKE_USERNAME }} CYPRESS_SNOWFLAKE_PASSWORD: ${{ secrets.SNOWFLAKE_PASSWORD }} + GITHUB_WORKFLOW : ${{ github.workflow }} with: browser: ${{ env.BROWSER_PATH }} install: false diff --git a/app/client/cypress/scripts/cypress-split-dynamic.ts b/app/client/cypress/scripts/cypress-split-dynamic.ts index f79b89cea65f..f520d55aee9c 100644 --- a/app/client/cypress/scripts/cypress-split-dynamic.ts +++ b/app/client/cypress/scripts/cypress-split-dynamic.ts @@ -98,6 +98,8 @@ export class dynamicSplit { private async createAttempt() { const client = await this.dbClient.connect(); try { + const workflowName = this.util.getVars().gitWorkflowName; + const commitMsgWithWorkflow = `${this.util.getVars().commitMsg}_${workflowName}`; const runResponse = await client.query( `INSERT INTO public."attempt" ("workflowId", "attempt", "repo", "committer", "type", "commitMsg", "branch") VALUES ($1, $2, $3, $4, $5, $6, $7) @@ -109,7 +111,7 @@ export class dynamicSplit { this.util.getVars().repository, this.util.getVars().committer, this.util.getVars().tag, - this.util.getVars().commitMsg, + commitMsgWithWorkflow, this.util.getVars().branch, ], ); diff --git a/app/client/cypress/scripts/cypress-split-static.ts b/app/client/cypress/scripts/cypress-split-static.ts index ccd8cb8e4833..9597eb4e0ae3 100644 --- a/app/client/cypress/scripts/cypress-split-static.ts +++ b/app/client/cypress/scripts/cypress-split-static.ts @@ -67,6 +67,8 @@ export class staticSplit { private async createAttempt() { const client = await this.dbClient.connect(); try { + const workflowName = this.util.getVars().gitWorkflowName; + const commitMsgWithWorkflow = `${this.util.getVars().commitMsg}_${workflowName}`; const runResponse = await client.query( `INSERT INTO public."attempt" ("workflowId", "attempt", "repo", "committer", "type", "commitMsg", "branch") VALUES ($1, $2, $3, $4, $5, $6, $7) @@ -78,7 +80,7 @@ export class staticSplit { this.util.getVars().repository, this.util.getVars().committer, this.util.getVars().tag, - this.util.getVars().commitMsg, + commitMsgWithWorkflow, this.util.getVars().branch, ], ); diff --git a/app/client/cypress/scripts/util.ts b/app/client/cypress/scripts/util.ts index 44321cf4be6c..0112825ff29d 100644 --- a/app/client/cypress/scripts/util.ts +++ b/app/client/cypress/scripts/util.ts @@ -42,6 +42,7 @@ export default class util { staticAllocation: this.getEnvValue("CYPRESS_STATIC_ALLOCATION", { required: false, }), + gitWorkflowName: this.getEnvValue("GITHUB_WORKFLOW", { required: false }), }; }