test grouping

changement nul migration first revert
pass-culture · Sep 20, 2024 · 0aefd66 · 0aefd66
1 parent bf04f74
commit 0aefd66
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 23 deletions.
diff --git a/.github/workflows/dev_on_pull_request_workflow.yml b/.github/workflows/dev_on_pull_request_workflow.yml
@@ -221,31 +221,31 @@ jobs:
       GCP_EHP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_EHP_WORKLOAD_IDENTITY_PROVIDER }}
       GCP_EHP_SERVICE_ACCOUNT: ${{ secrets.GCP_EHP_SERVICE_ACCOUNT }}
 
-  test-pro-e2e:
-    name: "Tests pro E2E"
+  # FIXME : (mageoffray, 19-09-2024)
+  # this workflow is temporary and will be used to transitioned between
+  # e2e tests based on e2e sandbox and e2e tests based on micro sandboxes
+  test-pro-e2e-migration:
+    name: "Tests pro E2E migrations"
     needs: [pcapi-init-job, build-pcapi]
-    uses: ./.github/workflows/dev_on_workflow_tests_pro_e2e.yml
+    uses: ./.github/workflows/dev_on_workflow_tests_pro_e2e_migration.yml
     if: |
       always() &&
-      needs.pcapi-init-job.outputs.api-changed == 'true' || 
+      needs.pcapi-init-job.outputs.api-changed == 'true' ||
       needs.pcapi-init-job.outputs.pro-changed == 'true'
     with:
       tag: ${{ needs.build-pcapi.result == 'skipped' && 'latest' || needs.pcapi-init-job.outputs.checksum-tag }}
       CACHE_BUCKET_NAME: "passculture-infra-prod-github-runner-cache"
     secrets:
       GCP_EHP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_EHP_WORKLOAD_IDENTITY_PROVIDER }}
       GCP_EHP_SERVICE_ACCOUNT: ${{ secrets.GCP_EHP_SERVICE_ACCOUNT }}
-
-  # FIXME : (mageoffray, 19-09-2024)
-  # this workflow is temporary and will be used to transitioned between
-  # e2e tests based on industrial sandbox and e2e tests based on micro sandboxes
-  test-pro-e2e-migration:
-    name: "Tests pro E2E migrations"
+
+  test-pro-e2e:
+    name: "Tests pro E2E"
     needs: [pcapi-init-job, build-pcapi]
-    uses: ./.github/workflows/dev_on_workflow_tests_pro_e2e_migration.yml
+    uses: ./.github/workflows/dev_on_workflow_tests_pro_e2e.yml
     if: |
       always() &&
-      needs.pcapi-init-job.outputs.api-changed == 'true' ||
+      needs.pcapi-init-job.outputs.api-changed == 'true' || 
       needs.pcapi-init-job.outputs.pro-changed == 'true'
     with:
       tag: ${{ needs.build-pcapi.result == 'skipped' && 'latest' || needs.pcapi-init-job.outputs.checksum-tag }}

diff --git a/.github/workflows/dev_on_push_workflow_main.yml b/.github/workflows/dev_on_push_workflow_main.yml
@@ -224,10 +224,13 @@ jobs:
       GCP_EHP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_EHP_WORKLOAD_IDENTITY_PROVIDER }}
       GCP_EHP_SERVICE_ACCOUNT: ${{ secrets.GCP_EHP_SERVICE_ACCOUNT }}
 
-  test-pro-e2e:
-    name: "Tests pro E2E"
+  # FIXME : (mageoffray, 19-09-2024)
+  # this workflow is temporary and will be used to transitioned between
+  # e2e tests based on e2e sandbox and e2e tests based on micro sandboxes
+  test-pro-e2e-migration:
+    name: "Tests pro E2E migrations"
     needs: [pcapi-init-job, build-pcapi]
-    uses: ./.github/workflows/dev_on_workflow_tests_pro_e2e.yml
+    uses: ./.github/workflows/dev_on_workflow_tests_pro_e2e_migration.yml
     if: |
       always() &&
       needs.pcapi-init-job.outputs.api-changed == 'true' ||
@@ -239,13 +242,10 @@ jobs:
       GCP_EHP_WORKLOAD_IDENTITY_PROVIDER: ${{ secrets.GCP_EHP_WORKLOAD_IDENTITY_PROVIDER }}
       GCP_EHP_SERVICE_ACCOUNT: ${{ secrets.GCP_EHP_SERVICE_ACCOUNT }}
 
-  # FIXME : (mageoffray, 19-09-2024)
-  # this workflow is temporary and will be used to transitioned between
-  # e2e tests based on industrial sandbox and e2e tests based on micro sandboxes
-  test-pro-e2e-migration:
-    name: "Tests pro E2E migrations"
+  test-pro-e2e:
+    name: "Tests pro E2E"
     needs: [pcapi-init-job, build-pcapi]
-    uses: ./.github/workflows/dev_on_workflow_tests_pro_e2e_migration.yml
+    uses: ./.github/workflows/dev_on_workflow_tests_pro_e2e.yml
     if: |
       always() &&
       needs.pcapi-init-job.outputs.api-changed == 'true' ||

diff --git a/.github/workflows/dev_on_workflow_tests_pro_e2e.yml b/.github/workflows/dev_on_workflow_tests_pro_e2e.yml
@@ -147,7 +147,8 @@ jobs:
           browser: chrome
           config-file: cypress/old_cypress.config.ts
           env: TAGS="@P0"
-          record: ${{ github.ref == 'refs/heads/master' }} # for Cypress Cloud
+          record: ${{ github.ref != 'refs/heads/master' }} # for Cypress Cloud
+          group: 'Tests with yet-to-be-removed sandbox'
         env:
           CYPRESS_RECORD_KEY: ${{ steps.secrets.outputs.CYPRESS_CLOUD_RECORD_KEY }}
           CYPRESS_PROJECT_ID: ${{ steps.secrets.outputs.CYPRESS_CLOUD_PROJECT_ID }}

diff --git a/.github/workflows/dev_on_workflow_tests_pro_e2e_migration.yml b/.github/workflows/dev_on_workflow_tests_pro_e2e_migration.yml
@@ -145,8 +145,9 @@ jobs:
           browser: chrome
           config-file: cypress/cypress.config.ts
           env: TAGS="@P0"
-          record: ${{ github.ref == 'refs/heads/master' }} # for Cypress Cloud
+          record: ${{ github.ref != 'refs/heads/master' }} # for Cypress Cloud
           spec: "cypress/e2e/migrations/*"
+          group: 'Tests migrated with Data Factory'
         env:
           CYPRESS_RECORD_KEY: ${{ steps.secrets.outputs.CYPRESS_CLOUD_RECORD_KEY }}
           CYPRESS_PROJECT_ID: ${{ steps.secrets.outputs.CYPRESS_CLOUD_PROJECT_ID }}