From 903ee5afee8c3700892c3d1881e75269496792db Mon Sep 17 00:00:00 2001
From: yurydubinin <62520712+yury-dubinin@users.noreply.github.com>
Date: Tue, 29 Oct 2024 11:33:08 +0100
Subject: [PATCH] Updated Prod E2E tests workflow

---
 .github/workflows/frontend-e2e-tests.yml      |  8 ++--
 .github/workflows/prod-frontend-e2e-tests.yml | 42 +++++++++++++++++--
 2 files changed, 43 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/frontend-e2e-tests.yml b/.github/workflows/frontend-e2e-tests.yml
index 264dd26375..df6c88e0d2 100644
--- a/.github/workflows/frontend-e2e-tests.yml
+++ b/.github/workflows/frontend-e2e-tests.yml
@@ -28,7 +28,7 @@ jobs:
 
   preview-swap-tests:
     timeout-minutes: 10
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: wait-for-deployment
     steps:
       - name: Check out repository
@@ -74,7 +74,7 @@ jobs:
   preview-portfolio-trx-tests:
     timeout-minutes: 10
     needs: wait-for-deployment
-    runs-on: macos-14
+    runs-on: macos-latest
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -111,7 +111,7 @@ jobs:
   preview-pools-and-select-pair-tests:
     timeout-minutes: 10
     needs: wait-for-deployment
-    runs-on: macos-14
+    runs-on: ubuntu-latest
     steps:
       - name: Check out repository
         uses: actions/checkout@v4
@@ -145,7 +145,7 @@ jobs:
 
   preview-trade-tests:
     timeout-minutes: 10
-    runs-on: macos-14
+    runs-on: macos-latest
     needs: [wait-for-deployment, preview-swap-tests]
     steps:
       - name: Check out repository
diff --git a/.github/workflows/prod-frontend-e2e-tests.yml b/.github/workflows/prod-frontend-e2e-tests.yml
index ad86c56a2f..25aeb62722 100644
--- a/.github/workflows/prod-frontend-e2e-tests.yml
+++ b/.github/workflows/prod-frontend-e2e-tests.yml
@@ -30,6 +30,7 @@ jobs:
 
   prod-e2e-tests:
     runs-on: macos-latest
+    timeout-minutes: 15
     needs: wait-for-deployment
     environment:
       name: prod_swap_test
@@ -55,17 +56,17 @@ jobs:
       - name: Run Swap Pair tests on Master
         env:
           BASE_URL: "https://app.osmosis.zone"
-          PRIVATE_KEY: ${{ secrets.PRIVATE_KEY }}
+          PRIVATE_KEY: ${{ secrets.TEST_PRIVATE_KEY }}
           WALLET_ID: ${{ secrets.TEST_WALLET_ID }}
         run: |
           cd packages/web
-          npx playwright test -g "Test Swap feature"
+          npx playwright test transactions portfolio swap.wallet
       - name: upload test results
         if: always()
         id: e2e-test-results
         uses: actions/upload-artifact@v4
         with:
-          name: main-e2e-test-results-${{ github.run_id }}
+          name: prod-e2e-test-results-${{ github.run_id }}
           path: packages/web/playwright-report
       - name: Send Slack alert if test fails
         id: slack
@@ -102,3 +103,38 @@ jobs:
         env:
           SLACK_WEBHOOK_URL: ${{ secrets.SERVER_E2E_TESTS_SLACK_WEBHOOK_URL }}
           SLACK_WEBHOOK_TYPE: INCOMING_WEBHOOK
+
+  prod-pools-and-select-pair-tests:
+    timeout-minutes: 10
+    needs: wait-for-deployment
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check out repository
+        uses: actions/checkout@v4
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: 20.x
+      - name: Cache dependencies
+        uses: actions/cache@v4
+        with:
+          path: "**/node_modules"
+          key: ${{ runner.OS }}-20.x-${{ hashFiles('**/yarn.lock') }}
+          restore-keys: |
+            ${{ runner.OS }}-20.x-
+      - name: Install Playwright
+        run: |
+          yarn --cwd packages/web install --frozen-lockfile && npx playwright install --with-deps chromium
+      - name: Run Pools tests
+        env:
+          BASE_URL: "https://app.osmosis.zone"
+        run: |
+          cd packages/web
+          npx playwright test pools select
+      - name: upload pools test results
+        if: failure()
+        id: pools-test-results
+        uses: actions/upload-artifact@v4
+        with:
+          name: prod-pools-test-results-${{ github.run_id }}
+          path: packages/web/playwright-report