ci: disable e2e splitting

getlarge · Jun 26, 2024 · adb8354 · adb8354
1 parent 4bf2534
commit adb8354
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 13 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -75,19 +75,17 @@ jobs:
       - run: npx nx-cloud record -- docker compose -p cat-fostering logs keto -n 500
       - run: npx nx-cloud record -- docker compose -p cat-fostering logs kratos -n 500
 
-      - run: npx nx affected -t e2e --no-agents
-        if: ${{ env.NX_CLOUD_DISTRIBUTED_EXECUTION == 'false' }}
+      - name: Run e2e tests
+        run: npx nx affected -t e2e --no-agents
+        # if: ${{ env.NX_CLOUD_DISTRIBUTED_EXECUTION == 'false' }}
 
       # to enable DTE for e2e tests splitting, use the following command instead and set stop-agents-after="e2e-ci"
-      - run: |
-          npm run ory:generate:keto -- -e .env.ci
-          docker compose -p cat-fostering restart keto
-          npm run ory:generate:kratos -- -e .env.ci
-          docker compose -p cat-fostering restart kratos
-          npm run pg:create:connection -- -e .env.ci
-          docker compose -p cat-fostering restart api
-          npx nx affected -t e2e-ci
-        if: ${{ env.NX_CLOUD_DISTRIBUTED_EXECUTION == 'true' }}
+      # - name: Run distributed e2e tests
+      #   run: |
+      #     npm run pg:create:connection -- -e .env.ci
+      #     docker compose -p cat-fostering restart api
+      #     npx nx affected -t e2e-ci
+      #   if: ${{ env.NX_CLOUD_DISTRIBUTED_EXECUTION == 'true' }}
 
       - run: npx nx-cloud complete-ci-run
         if: always() && ${{ env.NX_CLOUD_DISTRIBUTED_EXECUTION == 'true' }}
diff --git a/apps/cat-fostering-api-e2e/src/support/global-setup.ts b/apps/cat-fostering-api-e2e/src/support/global-setup.ts
@@ -35,7 +35,7 @@ export default async (): Promise<void> => {
     process.env.CI ||
     process.env.ACT ||
     // unfortunately, the task generated for tests splitting do not contain the target name
-    process.env.NX_TASK_TARGET_TARGET === 'e2e-ci'
+    process.env.NX_TASK_TARGET_TARGET?.includes('e2e-ci')
   ) {
     return;
   }

diff --git a/apps/cat-fostering-api-e2e/src/support/global-teardown.ts b/apps/cat-fostering-api-e2e/src/support/global-teardown.ts
@@ -19,7 +19,7 @@ export default async (): Promise<void> => {
     process.env.CI ||
     process.env.ACT ||
     // unfortunately, the task generated for tests splitting do not contain the target name
-    process.env.NX_TASK_TARGET_TARGET === 'e2e-ci'
+    process.env.NX_TASK_TARGET_TARGET?.includes('e2e-ci')
   ) {
     return;
   }