Merge branch 'develop' into vite

.github/workflows/build-and-deploy.yml

@@ -149,6 +149,10 @@ jobs:
       # Create a slugified value of the branch
       - uses: rlespinasse/github-slug-action@3.1.0
 
+      - name: Set ADMIN_URL if "deploy-connect-to-admin" label is set
+        run: echo "ADMIN_API_URL=https://${{ github.event_name == 'pull_request' && env.GITHUB_HEAD_REF_SLUG || env.GITHUB_REF_SLUG }}.test.workadventu.re" >> $GITHUB_ENV
+        if: ${{ github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'deploy-connect-to-admin') }}
+
       - name: Write certificate
         run: echo "${CERTS_PRIVATE_KEY}" > secret.key && chmod 0600 secret.key
         env:
@@ -185,6 +189,7 @@ jobs:
         env:
           KUBE_CONFIG_FILE: ${{ secrets.KUBE_CONFIG_FILE }}
           ADMIN_API_TOKEN: ${{ secrets.ADMIN_API_TOKEN }}
+          ADMIN_SOCKETS_TOKEN: ${{ secrets.ADMIN_SOCKETS_TOKEN }}
           JITSI_ISS: ${{ secrets.JITSI_ISS }}
           JITSI_URL: ${{ secrets.JITSI_URL }}
           SECRET_JITSI_KEY: ${{ secrets.SECRET_JITSI_KEY }}

.github/workflows/end_to_end_tests.yml

@@ -1,6 +1,4 @@
-# https://help.github.com/en/categories/automating-your-workflow-with-github-actions
-
-name: "End to end tests"
+name: 'End to end tests'
 
 on:
   push:
@@ -10,117 +8,31 @@ on:
   pull_request:
 
 jobs:
-
-  start-runner:
-    if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false)
-    name: Start self-hosted EC2 runner
+  test:
+    timeout-minutes: 60
     runs-on: ubuntu-latest
-    outputs:
-      label: ${{ steps.start-ec2-runner.outputs.label }}
-      ec2-instance-id: ${{ steps.start-ec2-runner.outputs.ec2-instance-id }}
     steps:
-      - name: Configure AWS credentials
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
-      - name: Start EC2 runner
-        id: start-ec2-runner
-        uses: machulav/ec2-github-runner@v2
-        with:
-          mode: start
-          github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
-          ec2-image-id: ami-094dbcc53250a2480
-          ec2-instance-type: m5.2xlarge
-          subnet-id: subnet-0ac40025f559df1bc
-          security-group-id: sg-0e36e96e3b8ed2d64
-          #iam-role-name: my-role-name # optional, requires additional permissions
-          #aws-resource-tags: > # optional, requires additional permissions
-          #  [
-          #    {"Key": "Name", "Value": "ec2-github-runner"},
-          #    {"Key": "GitHubRepository", "Value": "${{ github.repository }}"}
-          #  ]
-
-
-  end-to-end-tests:
-    name: "End-to-end testcafe tests"
-
-    needs: start-runner # required to start the main job when the runner is ready
-    runs-on: ${{ needs.start-runner.outputs.label }} # run the job on the newly created runner
-
-    steps:
-      - name: "Checkout"
-        uses: "actions/checkout@v2.0.0"
-
-      - name: "Setup NodeJS"
-        uses: actions/setup-node@v1
+      - uses: actions/checkout@v2
+      - uses: actions/setup-node@v2
         with:
           node-version: '14.x'
-
-      - name: "Install dependencies"
-        run: npm install
-        working-directory: "tests"
-
-      - name: "Setup .env file"
+      - name: Install dependencies
+        run: npm ci
+        working-directory: tests
+      - name: Install Playwright
+        run: npx playwright install --with-deps
+      - name: 'Setup .env file'
         run: cp .env.template .env
-
-      - name: "Edit ownership of file for test cases"
-        run: sudo chown 1000:1000 -R .
-
-      - name: "Start environment"
-        run: docker-compose up -d
-
-      - name: "Wait for environment to build (and downloading testcafe image)"
-        run: (docker-compose -f docker-compose.testcafe.yml build &) && docker-compose logs -f --tail=0 front | grep -q "Compiled successfully"
-
-#      - name: "temp debug: display logs"
-#        run: docker-compose logs
-#
-#      - name: "Wait for back start"
-#        run: docker-compose logs -f back | grep -q "WorkAdventure HTTP API starting on port"
-#
-#      - name: "Wait for pusher start"
-#        run: docker-compose logs -f pusher | grep -q "WorkAdventure starting on port"
-
-      - name: "Run tests"
-        run: PROJECT_DIR=$(pwd) docker-compose -f docker-compose.testcafe.yml up --exit-code-from testcafe
-
-      - name: Upload failed tests
-        if: ${{ failure() }}
-        uses: actions/upload-artifact@v2
+      - name: Start WorkAdventure
+        run: docker-compose -f docker-compose.yaml -f docker-compose.e2e.yml up -d --build
+      - name: Wait for environment to Start
+        run: sleep 60
+      - name: Run Playwright tests
+        run: npm run test-prod-like
+        working-directory: tests
+      - uses: actions/upload-artifact@v2
+        if: always()
         with:
-          name: my-artifact
-          path: './tests/screenshots/'
-
-      - name: Display state
-        if: ${{ failure() }}
-        run: docker-compose ps
-
-      - name: Display logs
-        if: ${{ failure() }}
-        run: docker-compose logs
-
-  stop-runner:
-    name: Stop self-hosted EC2 runner
-    needs:
-      - start-runner # required to get output from the start-runner job
-      - end-to-end-tests # required to wait when the main job is done
-    runs-on: ubuntu-latest
-    if: ${{ always() }} # required to stop the runner even if the error happened in the previous jobs
-    steps:
-      - name: Configure AWS credentials
-        if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false)
-        uses: aws-actions/configure-aws-credentials@v1
-        with:
-          aws-access-key-id: ${{ secrets.AWS_ACCESS_KEY_ID }}
-          aws-secret-access-key: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-          aws-region: ${{ secrets.AWS_REGION }}
-      - name: Stop EC2 runner
-        if: github.event_name == 'push' || (github.event_name == 'pull_request' && github.event.pull_request.head.repo.fork == false)
-        uses: machulav/ec2-github-runner@v2
-        with:
-          mode: stop
-          github-token: ${{ secrets.GH_PERSONAL_ACCESS_TOKEN }}
-          label: ${{ needs.start-runner.outputs.label }}
-          ec2-instance-id: ${{ needs.start-runner.outputs.ec2-instance-id }}
+          name: playwright-report
+          path: tests/playwright-report/
+          retention-days: 30