E2E Test Automation Enhancements

.circleci/config.yml

@@ -3,6 +3,9 @@ parameters:
   run_e2e_tests:
     type: boolean
     default: false
+  test_command:
+    type: string
+    default: "npm run test-testnet-viem-combined"
 orbs:
   slack: circleci/slack@3.4.2
 
@@ -44,6 +47,10 @@ jobs:
       #     webhook: "${SLACK_WEBHOOK_URL}"
 
   e2e-tests:
+    parameters:
+      test_command:
+        type: string
+        default: "npm run test-testnet-viem-combined"
     working_directory: ~/etherspot-modular-sdk
     docker:
       - image: cimg/node:20.11.1
@@ -89,20 +96,27 @@ jobs:
                 sed -i.bak "s/bundler_api_key/$BUNDLER_API_KEY/g" .env
                 sed -i.bak "s/data_api_key/$DATA_API_KEY/g" .env
                 sed -i.bak "s/api_key_arka/$API_KEY_ARKA/g" .env
-                #sed -i.bak "s/api_key_sessionkey/$API_KEY_SESSIONKEY/g" .env
+                sed -i.bak "s/api_key_sessionkey/$API_KEY_SESSIONKEY/g" .env
+                sed -i.bak "s/primary_private_key/$PRIMARY_PRIVATE_KEY/g" .env
+                sed -i.bak "s/secondary_private_key/$SECONDARY_PRIVATE_KEY/g" .env
+                sed -i.bak "s/primary_wallet_address/$PRIMARY_WALLET_ADDRESS/g" .env
+                sed -i.bak "s/secondary_wallet_address/$SECONDARY_WALLET_ADDRESS/g" .env
+                sed -i.bak "s/paymaster_address/$PAYMASTER_ADDRESS/g" .env
+                sed -i.bak "s/sponsor_address/$SPONSOR_ADDRESS/g" .env
                 mv package.json temp.json
                 jq -r '.dependencies."@etherspot/modular-sdk" |= "file:../etherspot-modular-sdk"' temp.json > package.json
                 rm temp.json
                 npm i
-                npm run test-testnet-viem-combined
+                << parameters.test_command >>
           - run:
               name: Move test report
               command: |
-                mv /home/circleci/e2e-sdk-modular/mochawesome-report /tmp/
-                chmod 777 -R /tmp/mochawesome-report
+                mkdir -p /tmp/test-report
+                cp -r reports/test-report.html /tmp/test-report/
+                chmod 777 -R /tmp/test-report
               when: always 
           - store_artifacts:
-              path: /tmp/mochawesome-report
+              path: /tmp/test-report
               when: always
           - run:
               name: Parse and send test results to Slack
@@ -216,32 +230,48 @@ jobs:
             ghr -t "${GITHUB_TOKEN}" -u "${CIRCLE_PROJECT_USERNAME}" -r "${CIRCLE_PROJECT_REPONAME}" -c "${CIRCLE_SHA1}" "$PACKAGE_VERSION"
 
 workflows:
-  version: 2.1
-  install_and_publish:
+  run-e2e-only:
+    when: << pipeline.parameters.run_e2e_tests >>
+    jobs:
+      - e2e-tests:
+          context: general-vars
+          test_command: "npm run test-mainnet-viem-combined"
+
+  install-and-publish:
+    when:
+      not: << pipeline.parameters.run_e2e_tests >>
     jobs:
       - install:
           context: general-vars
       - e2e-tests:
+          name: testnet-e2e-tests
           context: general-vars
-          requires:
-            - install
-          # filters:
-          #   branches:
-          #     only:
-          #         - master
+          test_command: "npm run test-testnet-viem-combined"
+          filters:
+            branches:
+              only:
+                - develop
+      - e2e-tests:
+          name: mainnet-e2e-tests
+          context: general-vars
+          test_command: "npm run test-mainnet-viem-combined"
+          filters:
+            branches:
+              only:
+                - master
       - publish-npm-package:
           context: general-vars
           requires:
-            - e2e-tests
+            - mainnet-e2e-tests
           filters:
             branches:
               only:
-                  - master
+                - master
       - publish-github-release:
           context: general-vars
           requires:
             - publish-npm-package
           filters:
             branches:
               only:
-                  - master
+                - master