E2E: Run E2E tests with Server Init (#3452)

* Run mm server via Docker

* Run mm server via Docker

* test separate server setup for e2e jobs

* Revert "test separate server setup for e2e jobs"

This reverts commit efd23823ac65de8945d635ce9f699c7a9e4fbd77.

* Fix docker on windows

* test run

* test run

* fix

* try a script to trigger Server spinup

* try a script to trigger Server spinup

* test

* remove the trigger workflow

* Change Label

* test-run with disabled E2E/Run label

* test-run

* test-run

* Fixes desktop e2e

* Fixes desktop e2e

* Fixes desktop e2e

* Fixes desktop e2e

---------

Co-authored-by: Mattermost Build <build@mattermost.com>

.github/PULL_REQUEST_TEMPLATE.md

@@ -28,7 +28,7 @@ Place an '[x]' (no spaces) in all applicable fields. Please remove unrelated fie
 - [ ] read and understood our [Contributing Guidelines](https://github.com/mattermost/desktop/blob/master/CONTRIBUTING.md)
 - [ ] completed [Mattermost Contributor Agreement](https://mattermost.com/contribute/)
 - [ ] executed `npm run lint:js` for proper code formatting
-- [ ] Run E2E tests by adding label `Run Desktop E2E Tests`
+- [ ] Run E2E tests by adding label `E2E/Run`
 
 #### Device Information
 This PR was tested on: <!-- Device name(s), OS version(s) -->

.github/workflows/e2e-functional-template.yml

@@ -24,7 +24,7 @@ on:
         type: string
         description: "The E2E tests underlying OS"
         required: true
-        default: "ubuntu-22.04"
+        default: "ubuntu-24.04"
       nightly:
         type: boolean
         description: "True if this is nightly build"
@@ -43,7 +43,7 @@ on:
       MM_SERVER_VERSION:
         type: string
         required: false
-        default: "9.9.1"
+        default: "10.5.0"
     outputs:
       NEW_FAILURES_LINUX:
         description: "The output to comment"
@@ -96,7 +96,7 @@ on:
         type: string
         description: "The E2E tests underlying OS"
         required: true
-        default: "ubuntu-22.04"
+        default: "ubuntu-24.04"
       nightly:
         type: boolean
         description: "True if this is nightly build"
@@ -115,14 +115,14 @@ on:
       MM_SERVER_VERSION:
         type: string
         required: false
-        default: "9.9.1"
+        default: "10.10.0"
 
 env:
   AWS_S3_BUCKET: "mattermost-cypress-report"
   BRANCH: ${{ github.head_ref || github.ref_name }}
   BUILD_TAG: ${{ github.event.pull_request.head.sha || github.sha }}
   JIRA_PROJECT_KEY: "MM"
-  MM_TEST_SERVER_URL: ${{ inputs.MM_TEST_SERVER_URL || secrets.MM_DESKTOP_E2E_SERVER_URL }}
+  MM_TEST_SERVER_URL: ${{ inputs.MM_TEST_SERVER_URL }}
   MM_TEST_USER_NAME: ${{ inputs.MM_TEST_USER_NAME || secrets.MM_DESKTOP_E2E_USER_NAME }}
   MM_TEST_PASSWORD: ${{ inputs.MM_TEST_PASSWORD || secrets.MM_DESKTOP_E2E_USER_CREDENTIALS }}
   PULL_REQUEST: "https://github.com/mattermost/desktop/pull/${{ github.event.number }}"
@@ -136,7 +136,7 @@ env:
   ZEPHYR_API_KEY: ${{ secrets.MM_DESKTOP_E2E_ZEPHYR_API_KEY }}
   REPORT_LINK: "none"
   NODE_VERSION: 18
-  SERVER_VERSION: ${{ inputs.MM_SERVER_VERSION || '9.9.1' }}
+  SERVER_VERSION: ${{ inputs.MM_SERVER_VERSION }}
   DESKTOP_VERSION: ${{ inputs.DESKTOP_VERSION }}
   PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD: 1
 
@@ -249,12 +249,11 @@ jobs:
           cd e2e && npm ci
           npx electron-rebuild --platform=${{ env.RUNNER_OS }} -f -t prod,optional,dev -w robotjs --module-dir ../
 
-      - name: e2e/run-playright-tests-linux
+      - name: e2e/run-playwright-tests-linux
         if: runner.os == 'Linux'
         run: |
           eval "$(dbus-launch --sh-syntax)"
           export NO_AT_BRIDGE=1
-
           npm run build-test
           cd e2e
           export PW_CHROMIUM_ARGS="--disable-gpu --no-sandbox --disable-dev-shm-usage"
@@ -264,7 +263,7 @@ jobs:
           SERVER_VERSION: ${{ inputs.MM_SERVER_VERSION }}
           DESKTOP_VERSION: ${{ inputs.DESKTOP_VERSION }}
 
-      - name: e2e/run-playright-tests-macos
+      - name: e2e/run-playwright-tests-macos
         if: runner.os == 'macOS'
         run: |
           sudo spctl --master-disable
@@ -277,7 +276,7 @@ jobs:
           SERVER_VERSION: ${{ inputs.MM_SERVER_VERSION }}
           DESKTOP_VERSION: ${{ inputs.DESKTOP_VERSION }}
 
-      - name: e2e/run-playright-tests-windows
+      - name: e2e/run-playwright-tests-windows
         if: runner.os == 'Windows'
         run: |
           npm run build-test
@@ -299,7 +298,6 @@ jobs:
             process.chdir('./e2e');
             const { analyzeFlakyTests } = require('./utils/analyze-flaky-test.js');
             const { newFailedTests, os } = analyzeFlakyTests();
-
             switch (os) {
               case 'linux':
                 core.setOutput('NEW_FAILURES_LINUX', newFailedTests.length);

.github/workflows/e2e-functional.yml

@@ -9,156 +9,92 @@ on:
     inputs:
       version_name:
         type: string
-        description: "Desktop Version name eg: 5.6"
+        description: "Desktop Version name eg: v5.11.0"
         required: true
-      platform:
+      instance_details:
-        type: choice
+        type: string
-        description: "Choose platform to run tests"
+        description: "JSON array of platform details"
-        required: true
+        required: false
-        default: "all"
+      MM_TEST_USER_NAME:
-        options: [linux, macos, windows, all]
+        description: "The admin username of the test instance"
+        required: false
+        type: string
+      MM_TEST_PASSWORD:
+        description: "The admin password of the test instance"
+        required: false
+        type: string
+      MM_SERVER_VERSION:
+        type: string
+        description: "The server version to test against"
+        required: false
+        default: "10.5.0"
 
 jobs:
-  update-initial-status-linux:
-    runs-on: ubuntu-22.04
-    if: contains(github.event.label.name, 'Run Desktop E2E Tests')
-    steps:
-      - uses: mattermost/actions/delivery/update-commit-status@main
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          repository_full_name: ${{ github.repository }}
-          commit_sha: ${{ github.event.pull_request.head.sha }}
-          context: e2e/linux
-          description: E2E tests for Mattermost desktop app on Linux have started...
-          status: pending
-
-  update-initial-status-macos:
-    runs-on: ubuntu-22.04
-    if: contains(github.event.label.name, 'Run Desktop E2E Tests')
-    steps:
-      - uses: mattermost/actions/delivery/update-commit-status@main
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          repository_full_name: ${{ github.repository }}
-          commit_sha: ${{ github.event.pull_request.head.sha }}
-          context: e2e/macOS
-          description: E2E tests for Mattermost desktop app on macOS have started...
-          status: pending
-
-  update-initial-status-windows:
-    runs-on: ubuntu-22.04
-    if: contains(github.event.label.name, 'Run Desktop E2E Tests')
-    steps:
-      - uses: mattermost/actions/delivery/update-commit-status@main
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          repository_full_name: ${{ github.repository }}
-          commit_sha: ${{ github.event.pull_request.head.sha }}
-          context: e2e/windows
-          description: E2E tests for Mattermost desktop app on Windows have started...
-          status: pending
-
   determine-platforms:
-    if: contains(github.event.label.name, 'Run Desktop E2E Tests')
-    needs: [update-initial-status-linux, update-initial-status-macos, update-initial-status-windows]
     runs-on: ubuntu-latest
     outputs:
-      platforms: ${{ steps.set-matrix.outputs.platforms }}
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
     steps:
       - id: set-matrix
         run: |
           if [[ "${{ github.event_name }}" == "workflow_dispatch" ]]; then
-            if [[ "${{ inputs.platform }}" == "all" ]]; then
+            if [[ -n "${{ inputs.instance_details }}" ]]; then
-              echo "platforms=['ubuntu-24.04', 'macos-13', 'windows-2022']" >> $GITHUB_OUTPUT
+              MATRIX=$(echo '${{ inputs.instance_details }}' | jq -c '[.[] | {os: .runner, platform: .platform, url: .url, installation_id: .installation_id}]')
+              echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
             else
-              case "${{ inputs.platform }}" in
+              MATRIX='[{"os":"ubuntu-24.04","platform":"linux","url":"${{ secrets.MM_TEST_SERVER_URL }}","installation_id":"unknown"},
-                linux)  echo "platforms=['ubuntu-24.04']" ;;
+                       {"os":"macos-13","platform":"macos","url":"${{ secrets.MM_TEST_SERVER_URL }}","installation_id":"unknown"},
-                macos)  echo "platforms=['macos-13']" ;;
+                       {"os":"windows-2022","platform":"windows","url":"${{ secrets.MM_TEST_SERVER_URL }}","installation_id":"unknown"}]'
-                windows) echo "platforms=['windows-2022']"
+              echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
-              esac >> $GITHUB_OUTPUT
             fi
-          elif [[ "${{ github.event_name }}" == "push" ]] || [[ "${{ contains(github.event.pull_request.labels.*.name, 'Run Desktop E2E Tests') }}" == "true" ]]; then
+          elif [[ "${{ github.event_name }}" == "push" ]] || [[ "${{ contains(github.event.pull_request.labels.*.name, 'E2E/Run') }}" == "true" ]]; then
-            echo "platforms=['ubuntu-24.04', 'macos-13', 'windows-2022']" >> $GITHUB_OUTPUT
+            MATRIX='[{"os":"ubuntu-24.04","platform":"linux","url":"${{ secrets.MM_TEST_SERVER_URL }}","installation_id":"unknown"},
+                     {"os":"macos-13","platform":"macos","url":"${{ secrets.MM_TEST_SERVER_URL }}","installation_id":"unknown"},
+                     {"os":"windows-2022","platform":"windows","url":"${{ secrets.MM_TEST_SERVER_URL }}","installation_id":"unknown"}]'
+            echo "matrix=$MATRIX" >> $GITHUB_OUTPUT
           else
-            echo "platforms=[]" >> $GITHUB_OUTPUT
+            echo "matrix=[]" >> $GITHUB_OUTPUT
           fi
 
   e2e-tests:
     needs: determine-platforms
     strategy:
       matrix:
-        os: ${{ fromJson(needs.determine-platforms.outputs.platforms) }}
+        platform: ${{ fromJson(needs.determine-platforms.outputs.matrix) }}
       fail-fast: false
+    runs-on: ${{ matrix.platform.os }}
+    steps:
+      - name: Update initial commit status
+        uses: mattermost/actions/delivery/update-commit-status@main
+        env:
+          GITHUB_TOKEN: ${{ github.token }}
+        with:
+          repository_full_name: ${{ github.repository }}
+          commit_sha: ${{ github.event.pull_request.head.sha || github.sha }}
+          context: e2e/${{ matrix.platform.platform }}
+          description: E2E tests for Mattermost desktop app on ${{ matrix.platform.platform }} have started...
+          status: pending
+
+      - name: Run E2E tests
+        id: run-tests
         uses: ./.github/workflows/e2e-functional-template.yml
-    secrets: inherit
         with:
-      runs-on: ${{ matrix.os }}
+          runs-on: ${{ matrix.platform.os }}
           DESKTOP_VERSION: ${{ inputs.version_name || github.head_ref || github.ref }}
+          MM_TEST_SERVER_URL: ${{ matrix.platform.url }}
+          MM_TEST_USER_NAME: ${{ inputs.MM_TEST_USER_NAME || secrets.MM_DESKTOP_E2E_USER_NAME }}
+          MM_TEST_PASSWORD: ${{ inputs.MM_TEST_PASSWORD || secrets.MM_DESKTOP_E2E_USER_CREDENTIALS }}
+          MM_SERVER_VERSION: ${{ inputs.MM_SERVER_VERSION || '10.5.0' }}
 
-  update-final-status-linux:
+      - name: Update final commit status
-    runs-on: ubuntu-22.04
+        if: always()
-    needs:
+        uses: mattermost/actions/delivery/update-commit-status@main
-      - e2e-tests
-    steps:
-      - uses: mattermost/actions/delivery/update-commit-status@main
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
           repository_full_name: ${{ github.repository }}
-          commit_sha: ${{ github.event.pull_request.head.sha }}
+          commit_sha: ${{ github.event.pull_request.head.sha || github.sha }}
-          context: e2e/linux
+          context: e2e/${{ matrix.platform.platform }}
-          description: Completed with ${{ needs.e2e-tests.outputs.NEW_FAILURES_LINUX }} failures
+          description: Completed with ${{ steps.run-tests.outputs.NEW_FAILURES }} failures
-          status: ${{ needs.e2e-tests.outputs.STATUS_LINUX }}
+          status: ${{ steps.run-tests.outputs.STATUS }}
-          target_url: ${{ needs.e2e-tests.outputs.REPORT_LINK_LINUX }}
+          target_url: ${{ steps.run-tests.outputs.REPORT_LINK }}
-
-  update-final-status-macos:
-    runs-on: ubuntu-22.04
-    needs:
-      - e2e-tests
-    steps:
-      - uses: mattermost/actions/delivery/update-commit-status@main
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          repository_full_name: ${{ github.repository }}
-          commit_sha: ${{ github.event.pull_request.head.sha }}
-          context: e2e/macOS
-          description: Completed with ${{ needs.e2e-tests.outputs.NEW_FAILURES_MACOS }} failures
-          status: ${{ needs.e2e-tests.outputs.STATUS_MACOS }}
-          target_url: ${{ needs.e2e-tests.outputs.REPORT_LINK_MACOS }}
-
-  update-final-status-windows:
-    runs-on: ubuntu-22.04
-    needs:
-      - e2e-tests
-    steps:
-      - uses: mattermost/actions/delivery/update-commit-status@main
-        env:
-          GITHUB_TOKEN: ${{ github.token }}
-        with:
-          repository_full_name: ${{ github.repository }}
-          commit_sha: ${{ github.event.pull_request.head.sha }}
-          context: e2e/windows
-          description: Completed with ${{ needs.e2e-tests.outputs.NEW_FAILURES_WINDOWS }} failures
-          status: ${{ needs.e2e-tests.outputs.STATUS_WINDOWS }}
-          target_url: ${{ needs.e2e-tests.outputs.REPORT_LINK_WINDOWS }}
-
-  e2e-remove-label:
-    if: ${{ always() && contains(github.event.pull_request.labels.*.name, 'Run Desktop E2E Tests') }}
-    needs: e2e-tests
-    runs-on: ubuntu-22.04
-    steps:
-      - name: Remove E2E test label
-        uses: actions/github-script@60a0d83039c74a4aee543508d2ffcb1c3799cdea # v7.0.1
-        continue-on-error: true # Label might have been removed manually
-        with:
-          script: |
-            github.rest.issues.removeLabel({
-              issue_number: context.issue.number,
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              name: 'Run Desktop E2E Tests',
-            });

e2e/modules/environment.js

@@ -259,23 +259,7 @@ module.exports = {
         await window.waitForSelector('#input_password-input');
         await window.waitForSelector('#saveSetting');
 
-        let username = process.env.MM_TEST_USERNAME;
+        await window.type('#input_loginId', process.env.MM_TEST_USER_NAME);
-        switch (process.platform) {
-        case 'darwin':
-            username = 'success+sysadmin+macos@simulator.amazonses.com';
-            break;
-        case 'linux':
-            username = 'success+sysadmin+linux@simulator.amazonses.com';
-            break;
-        case 'win32':
-            username = 'success+sysadmin+windows@simulator.amazonses.com';
-            break;
-        default:
-            throw new Error('Unsupported platform');
-        }
-
-        await window.type('#input_loginId', username);
-
         await window.type('#input_password-input', process.env.MM_TEST_PASSWORD);
         await window.click('#saveSetting');
     },