From ce201f47ac6b48341f9b9cbd766b87b51a7d1d92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Wed, 16 Oct 2024 12:39:05 +0200 Subject: [PATCH 1/4] IBX-8544: Run on RHEL 9 --- .github/workflows/browser-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index a8bd699..b6cc147 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -21,7 +21,7 @@ on: jobs: regression-commerce-setup1: name: "PHP 7.4/Node 18/PostgreSQL/Varnish/Redis/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@ibx-8544-rhel with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -44,7 +44,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} regression-commerce-setup2: name: "PHP 8.0/Node 18/MySQL/Compatibility layer/Elastic" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@ibx-8544-rhel with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} @@ -65,7 +65,7 @@ jobs: SLACK_WEBHOOK_URL: ${{ secrets.SLACK_WEBHOOK_URL }} regression-commerce-setup3: name: "PHP 8.3/Node 18/MySQL/Multirepository/Solr" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@ibx-8544-rhel with: project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} From 248baa0f9a4a39acbbe4862aa3fc6b5793e775f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 17 Oct 2024 11:31:40 +0200 Subject: [PATCH 2/4] ci scripts branch --- .github/workflows/browser-tests.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index b6cc147..792a358 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -23,6 +23,7 @@ jobs: name: "PHP 7.4/Node 18/PostgreSQL/Varnish/Redis/Multirepository" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@ibx-8544-rhel with: + ci-scripts-branch: ibx-8544-rhel project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=commerce" @@ -46,6 +47,7 @@ jobs: name: "PHP 8.0/Node 18/MySQL/Compatibility layer/Elastic" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@ibx-8544-rhel with: + ci-scripts-branch: ibx-8544-rhel project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=commerce" @@ -67,6 +69,7 @@ jobs: name: "PHP 8.3/Node 18/MySQL/Multirepository/Solr" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@ibx-8544-rhel with: + ci-scripts-branch: ibx-8544-rhel project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=commerce" From fdd1c5e387f56081e631c310b80bf51a0c1576c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 17 Oct 2024 15:57:06 +0200 Subject: [PATCH 3/4] simplify setup --- .github/workflows/browser-tests.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 792a358..e451e9e 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -31,10 +31,10 @@ jobs: test-setup-phase-2: "--profile=regression --suite=setup-commerce --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 + job-count: 1 multirepository: true php-image: "ghcr.io/ibexa/docker/php:7.4-node18" - timeout: 120 + timeout: 240 secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} @@ -56,10 +56,10 @@ jobs: setup: "doc/docker/base-dev.yml:doc/docker/elastic.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} use-compatibility-layer: true - job-count: 4 + job-count: 1 multirepository: true php-image: "ghcr.io/ibexa/docker/php:8.0-node18" - timeout: 120 + timeout: 240 secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} @@ -77,10 +77,10 @@ jobs: test-setup-phase-2: "--profile=regression --suite=setup-commerce --tags=@part2 --mode=standard" setup: "doc/docker/base-dev.yml:doc/docker/solr.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} - job-count: 4 + job-count: 1 multirepository: true php-image: "ghcr.io/ibexa/docker/php:8.3-node18" - timeout: 120 + timeout: 240 secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} From 51572826bc02c5d1b27102df6be6841384937bfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Thu, 17 Oct 2024 21:59:27 +0200 Subject: [PATCH 4/4] bump timeout --- .github/workflows/browser-tests.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index e451e9e..da57849 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -34,7 +34,7 @@ jobs: job-count: 1 multirepository: true php-image: "ghcr.io/ibexa/docker/php:7.4-node18" - timeout: 240 + timeout: 300 secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} @@ -59,7 +59,7 @@ jobs: job-count: 1 multirepository: true php-image: "ghcr.io/ibexa/docker/php:8.0-node18" - timeout: 240 + timeout: 300 secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }} @@ -80,7 +80,7 @@ jobs: job-count: 1 multirepository: true php-image: "ghcr.io/ibexa/docker/php:8.3-node18" - timeout: 240 + timeout: 300 secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} SATIS_NETWORK_TOKEN: ${{ secrets.SATIS_NETWORK_TOKEN }}