Merge branch '3.3' into 4.5

ibexa · Jul 20, 2023 · 2232e66 · 2232e66
2 parents a2458b6 + 637209c
commit 2232e66
Showing 1 changed file with 37 additions and 3 deletions.
diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml
@@ -7,6 +7,11 @@ on:
                 required: false
                 type: boolean
                 default: true
+            project-version:
+                description: 'Fill only when the tests should run on a stable release'
+                required: false
+                type: string
+                default: ''
     push:
         branches:
             - master
@@ -19,15 +24,16 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: "experience"
+            project-version: ${{ github.event.inputs.project-version }}
             test-suite: "--profile=regression --suite=experience"
             test-setup-phase-1: "--profile=regression --suite=setup-experience --tags=~@part2 --mode=standard"
             test-setup-phase-2: "--profile=regression --suite=setup-experience --tags=@part2 --mode=standard"
             setup: "doc/docker/base-dev.yml:doc/docker/db-postgresql.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml"
             send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }}
             job-count: 4
             multirepository: true
+            php-image: "ghcr.io/ibexa/docker/php:7.4-node14"
             timeout: 120
-            php-image: "ezsystems/php:7.4-v2-node14"
         secrets:
             SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }}
             SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }}
@@ -37,10 +43,34 @@ jobs:
             AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }}
             AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
     regression-experience-setup2:
-        name: "PHP 8.1/Node 16/MySQL/Compatibility layer"
+        name: "PHP 8.0/Node 16/MySQL/Compatibility layer"
+        uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
+        with:
+            project-edition: "experience"
+            project-version: ${{ github.event.inputs.project-version }}
+            test-suite: "--profile=regression --suite=experience"
+            test-setup-phase-1: "--profile=regression --suite=setup-experience --tags=~@part2 --mode=standard"
+            test-setup-phase-2: "--profile=regression --suite=setup-experience --tags=@part2 --mode=standard"
+            setup: "doc/docker/base-dev.yml:doc/docker/selenium.yml"
+            send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }}
+            use-compatibility-layer: true
+            job-count: 4
+            timeout: 120
+            php-image: "ghcr.io/ibexa/docker/php:8.0-node16"
+        secrets:
+            SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }}
+            SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }}
+            TRAVIS_GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }}
+            SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }}
+            AUTOMATION_CLIENT_ID: ${{ secrets.AUTOMATION_CLIENT_ID }}
+            AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }}
+            AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }}
+    regression-experience-setup3:
+        name: "PHP 8.1/Node 18/MySQL/Compatibility layer"
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: "experience"
+            project-version: ${{ github.event.inputs.project-version }}
             test-suite: "--profile=regression --suite=experience"
             test-setup-phase-1: "--profile=regression --suite=setup-experience --tags=~@part2 --mode=standard"
             test-setup-phase-2: "--profile=regression --suite=setup-experience --tags=@part2 --mode=standard"
@@ -49,7 +79,7 @@ jobs:
             use-compatibility-layer: true
             job-count: 4
             timeout: 120
-            php-image: "ezsystems/php:8.1-v2-node16"
+            php-image: "ghcr.io/ibexa/docker/php:8.1-node18"
         secrets:
             SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }}
             SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }}
@@ -63,6 +93,7 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: "experience"
+            project-version: ${{ github.event.inputs.project-version }}
             test-suite: "--profile=browser --suite=page-builder"
             test-setup-phase-1: "--mode=standard --profile=setup --suite=MapHost"
             setup: "doc/docker/base-dev.yml:doc/docker/multihost.yml:doc/docker/selenium.yml"
@@ -80,6 +111,7 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: "experience"
+            project-version: ${{ github.event.inputs.project-version }}
             test-suite: "--profile=browser --suite=page-builder"
             test-setup-phase-1: "--mode=standard --profile=setup --suite=MapURI"
             send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }}
@@ -96,6 +128,7 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: "experience"
+            project-version: ${{ github.event.inputs.project-version }}
             test-suite: "--profile=browser --suite=page-builder"
             test-setup-phase-1: "--mode=standard --profile=setup --suite=URIElement"
             send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }}
@@ -112,6 +145,7 @@ jobs:
         uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main
         with:
             project-edition: "experience"
+            project-version: ${{ github.event.inputs.project-version }}
             test-suite: "--profile=browser --suite=page-builder"
             test-setup-phase-1: "--mode=standard --profile=setup --suite=CompoundMapURIMapHost"
             setup: "doc/docker/base-dev.yml:doc/docker/multihost.yml:doc/docker/selenium.yml"