From eb9d0368914a08dec57cbf0f92b872792e43de4a Mon Sep 17 00:00:00 2001
From: filip mertens <filip.mertens@ethereum.org>
Date: Tue, 20 Sep 2022 19:00:30 +0200
Subject: [PATCH] groups

---
 .circleci/config.yml              | 7 +++++--
 apps/remix-ide/ci/browser_test.sh | 6 +++---
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index cf19b639eb..3f4c45eb2f 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -79,6 +79,8 @@ jobs:
         type: string
       script:
         type: string
+      group:
+        type: string
     parallelism: 95
     steps:
       - browser-tools/install-browser-tools
@@ -105,12 +107,11 @@ jobs:
       - run: yarn
       - run: yarn run downloadsolc_assets_e2e && yarn run downloadsolc_assets_dist
       - run: ls -la ./dist/apps/remix-ide/assets/js
-      - run: cp dist/apps/remix-ide/assets/version.json "${CIRCLE_INTERNAL_TASK_DATA}/version.json"
       - run:
           name: Start Selenium
           command: java -jar /usr/local/bin/selenium.jar
           background: true
-      - run: ./apps/remix-ide/ci/<< parameters.script >> << parameters.browser >>
+      - run: ./apps/remix-ide/ci/<< parameters.script >> << parameters.browser >> << parameters.group >>
       - store_test_results:
           path: ./reports/tests
       - store_artifacts:
@@ -243,6 +244,7 @@ workflows:
               parts: ["1"]
               browser: ["chrome", "firefox"]
               script: ["flaky.sh"]
+              group: ["nogroup"]
   build_all:
     unless: << pipeline.parameters.run_flaky_tests >>
     jobs:
@@ -267,6 +269,7 @@ workflows:
               parts: ["1"]
               browser: ["chrome", "firefox"]
               script: ["browser_test.sh"]
+              group: ["a-c","d-f","g-m","n-r","s","t-z"]
       - deploy-remix-live:
           requires:
             - lint
diff --git a/apps/remix-ide/ci/browser_test.sh b/apps/remix-ide/ci/browser_test.sh
index e897339492..4599cc5c0b 100755
--- a/apps/remix-ide/ci/browser_test.sh
+++ b/apps/remix-ide/ci/browser_test.sh
@@ -14,10 +14,10 @@ yarn run remixd &
 sleep 5
 
 yarn run build:e2e
-grep -IRiL "@disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test" | xargs -I {} basename {} .js | circleci tests split --split-by=timings
-TESTFILES=$(grep -IRiL "@disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test" | xargs -I {} basename {} .js | circleci tests split --split-by=timings )
+grep -IRiL "@disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test" | xargs -I {} basename {} .test.js | | grep-E '\b[$2]'
+TESTFILES=$(grep -IRiL "@disabled" "dist/apps/remix-ide-e2e/src/tests" | grep "\.spec\|\.test" | xargs -I {} basename {} .test.js | grep-E '\b[$2]' | circleci tests split --split-by=timings )
 for TESTFILE in $TESTFILES; do
-    npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/${TESTFILE}.js --env=$1  || TEST_EXITCODE=1
+    npx nightwatch --config dist/apps/remix-ide-e2e/nightwatch.js dist/apps/remix-ide-e2e/src/tests/${TESTFILE}.test.js --env=$1  || TEST_EXITCODE=1
 done
 
 echo "$TEST_EXITCODE"