From c438d7bf7c25247aec8ebe8a2c1987d10373aa47 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Noco=C5=84?= Date: Mon, 17 Jul 2023 11:19:58 +0200 Subject: [PATCH 1/2] [CI] Added project version input parameter --- .github/workflows/browser-tests.yml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index d87d4b6..6191392 100644 --- 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,7 +24,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" - project-version: "^3.3.x-dev" + 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" @@ -38,7 +43,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" - project-version: "^3.3.x-dev" + 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" @@ -58,7 +63,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" - project-version: "^3.3.x-dev" + 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" @@ -78,7 +83,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" - project-version: "^3.3.x-dev" + 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" @@ -93,7 +98,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" - project-version: "^3.3.x-dev" + 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' }} @@ -107,7 +112,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" - project-version: "^3.3.x-dev" + 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' }} @@ -121,7 +126,7 @@ jobs: uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" - project-version: "^3.3.x-dev" + 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" From 637209c21be86f52b4eec36ce6746780967050a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 20 Jul 2023 13:39:24 +0200 Subject: [PATCH 2/2] IBX-4516: Set a combination of 3 PHP & 3 Node versions. Ditched using default image (except matchers). (#196) * IBX-4516: Added image with Node 18 * Set a combination of 3 PHP & 3 Node versions. Ditched using default image. * Switched Matchers jobs to default image --- .github/workflows/browser-tests.yml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 6191392..cc95505 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -20,7 +20,7 @@ on: jobs: regression-experience-setup1: - name: "PHP 7.4/PostgreSQL/Varnish/Redis/Multirepository" + name: "PHP 7.3/PostgreSQL/Varnish/Redis/Multirepository" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" @@ -32,6 +32,7 @@ jobs: send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} job-count: 4 multirepository: true + php-image: "ghcr.io/ibexa/docker/php:7.3-node14" timeout: 120 secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} @@ -39,7 +40,7 @@ jobs: TRAVIS_GITHUB_TOKEN: ${{ secrets.TRAVIS_GITHUB_TOKEN }} SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} regression-experience-setup2: - name: "PHP 7.3/MySQL/Multirepository" + name: "PHP 7.4/MySQL/Multirepository" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" @@ -51,7 +52,7 @@ jobs: send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} job-count: 4 multirepository: true - php-image: "ezsystems/php:7.3-v2-node14" + php-image: "ghcr.io/ibexa/docker/php:7.4-node16" timeout: 120 secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} @@ -71,7 +72,7 @@ jobs: send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} job-count: 4 multirepository: true - php-image: "ezsystems/php:8.1-v2-node16" + php-image: "ghcr.io/ibexa/docker/php:8.1-node18" timeout: 120 secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }}