Use the tests from the core repo

ministryofjustice · Oct 1, 2024 · 5892213 · 5892213
1 parent fc4d482
commit 5892213
Showing 1 changed file with 9 additions and 11 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,7 +4,7 @@ orbs:
   node: circleci/node@5.2.0
 
 commands:
-################### Helpers
+  ################### Helpers
   lint:
     steps:
       - node/install
@@ -16,18 +16,21 @@ commands:
     steps:
       - run:
           name: Compress the artifacts for easier downloading
+          working_directory: ~/bichard7-next-core/packages/e2e-test
           when: always
-          command: for file in ~/bichard7-next-tests/screenshots/*; do tar -czf ${file}.tar.gz $file; done
+          command: for file in ./screenshots/*; do tar -czf ${file}.tar.gz $file; done
       - run:
           name: Create the saved_artifacts directory
+          working_directory: ~/bichard7-next-core/packages/e2e-test
           when: always
           command: mkdir ./saved_artifacts
       - run:
           name: Move the gzipped files across
+          working_directory: ~/bichard7-next-core/packages/e2e-test
           when: always
-          command: mv ~/bichard7-next-tests/screenshots/*.tar.gz ./saved_artifacts/
+          command: mv ./screenshots/*.tar.gz ./saved_artifacts/
       - store_artifacts:
-          path: /home/circleci/project/saved_artifacts
+          path: /home/circleci/bichard7-next-core/packages/e2e-test/saved_artifacts
 
   build_data_jar:
     description: Package the standing data into a jar file
@@ -74,8 +77,6 @@ commands:
           override-ci-command: npm i --workspaces --include-workspace-root
       - node/install-packages:
           app-dir: ~/bichard7-next-audit-logging
-      - node/install-packages:
-          app-dir: ~/bichard7-next-tests
 
   clone_packages:
     steps:
@@ -86,9 +87,6 @@ commands:
       - run:
           name: Clone bichard7-next-audit-logging
           command: git clone --depth 1 https://github.com/ministryofjustice/bichard7-next-audit-logging.git ~/bichard7-next-audit-logging
-      - run:
-          name: Clone bichard7-next-tests
-          command: git clone --depth 1 https://github.com/ministryofjustice/bichard7-next-tests.git ~/bichard7-next-tests
 
   build_message_forwarder:
     steps:
@@ -115,7 +113,7 @@ commands:
           working_directory: ~/bichard7-next-core
           command: bash .circleci/scripts/fetch-docker-images.sh <<parameters.IMAGES>>
 
-################### Services
+  ################### Services
 
   start_bichard7_legacy:
     parameters:
@@ -192,7 +190,7 @@ jobs:
       - run:
           name: Run E2E tests
           command: TOTAL_CHUNKS=$CIRCLE_NODE_TOTAL CHUNK_NUMBER=$CIRCLE_NODE_INDEX bash ./scripts/run_test_chunk.sh 'not @Excluded and not @ExcludedOnMaster and not @OnlyRunsOnPNC'
-          working_directory: ~/bichard7-next-tests
+          working_directory: ~/bichard7-next-core/packages/e2e-test
       - save_e2e_artifacts
 
 #################################################################################