From c059ad8b400dd078a1d430627f287eb2c7d0bbdf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Mon, 21 Oct 2024 13:27:42 +0200 Subject: [PATCH 1/3] [TMP] Run regression --- dependencies.json | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 0000000..dd08fd1 --- /dev/null +++ b/dependencies.json @@ -0,0 +1,11 @@ +{ + "recipesEndpoint": "", + "packages": [ + { + "requirement": "dev-IBX-8957_Sitefactory_ESI_fragments_containing_links_are_losing_factory_matcher_path as 4.6.x-dev", + "repositoryUrl": "https://github.com/ibexa/core", + "package": "ibexa/core", + "shouldBeAddedAsVCS": false + } + ] +} \ No newline at end of file From eb04c9a6b4ec52a57d1b6346c3559bb5022f91b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 22 Oct 2024 08:59:00 +0200 Subject: [PATCH 2/3] only matchers --- .github/workflows/browser-tests.yml | 79 ++--------------------------- 1 file changed, 5 insertions(+), 74 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 0ae9648..256e2db 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -19,77 +19,8 @@ on: pull_request: ~ jobs: - regression-experience-setup1: - name: "PHP 7.4/Node 18/PostgreSQL/Varnish/Redis/Multirepository" - 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-node18" - timeout: 120 - 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-setup2: - name: "PHP 8.0/Node 18/MySQL/Compatibility layer/Elastic" - 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/elastic.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-node18" - 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.3/Node 18/MySQL/Compatibility layer/Solr" - 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/solr.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.3-node18" - 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 }} page-builder-matchers-1: - name: "Map\\Host matcher tests" + name: "Map\\Host matcher tests/Varnish/Redis" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" @@ -97,7 +28,7 @@ jobs: test-suite: "--profile=browser --suite=page-builder" test-setup-phase-1: "--mode=standard --profile=setup --suite=MapHost" test-setup-phase-2: '--mode=standard --profile=setup --suite=page-builder --tags=@setup' - setup: "doc/docker/base-dev.yml:doc/docker/multihost.yml:doc/docker/selenium.yml" + setup: "doc/docker/base-dev.yml:doc/docker/multihost.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} @@ -108,7 +39,7 @@ jobs: AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} page-builder-matchers-2: - name: "Map\\URI matcher tests" + name: "Map\\URI matcher tests/Varnish/Redis" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" @@ -126,7 +57,7 @@ jobs: AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} page-builder-matchers-3: - name: "URIElement matcher tests" + name: "URIElement matcher tests/Varnish/Redis" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" @@ -144,7 +75,7 @@ jobs: AUTOMATION_CLIENT_INSTALLATION: ${{ secrets.AUTOMATION_CLIENT_INSTALLATION }} AUTOMATION_CLIENT_SECRET: ${{ secrets.AUTOMATION_CLIENT_SECRET }} page-builder-matchers-4: - name: "Compound matcher tests" + name: "Compound matcher tests/Varnish/Redis" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: project-edition: "experience" From 07527336c0849d9445c68cf2a0d57b13104e532b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Szo=C5=82tysek?= Date: Tue, 22 Oct 2024 09:55:12 +0200 Subject: [PATCH 3/3] fixup! only matchers --- .github/workflows/browser-tests.yml | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 256e2db..24ba31b 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -19,25 +19,6 @@ on: pull_request: ~ jobs: - page-builder-matchers-1: - name: "Map\\Host matcher tests/Varnish/Redis" - 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" - test-setup-phase-2: '--mode=standard --profile=setup --suite=page-builder --tags=@setup' - setup: "doc/docker/base-dev.yml:doc/docker/multihost.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" - send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} - 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 }} page-builder-matchers-2: name: "Map\\URI matcher tests/Varnish/Redis" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main @@ -47,6 +28,7 @@ jobs: test-suite: "--profile=browser --suite=page-builder" test-setup-phase-1: "--mode=standard --profile=setup --suite=MapURI" test-setup-phase-2: '--mode=standard --profile=setup --suite=page-builder --tags=@setup' + setup: "doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} @@ -65,6 +47,7 @@ jobs: test-suite: "--profile=browser --suite=page-builder" test-setup-phase-1: "--mode=standard --profile=setup --suite=URIElement" test-setup-phase-2: '--mode=standard --profile=setup --suite=page-builder --tags=@setup' + setup: "doc/docker/base-dev.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }} @@ -83,7 +66,7 @@ jobs: test-suite: "--profile=browser --suite=page-builder" test-setup-phase-1: "--mode=standard --profile=setup --suite=CompoundMapURIMapHost" test-setup-phase-2: '--mode=standard --profile=setup --suite=page-builder --tags=@setup' - setup: "doc/docker/base-dev.yml:doc/docker/multihost.yml:doc/docker/selenium.yml" + setup: "doc/docker/base-dev.yml:doc/docker/multihost.yml:doc/docker/varnish.yml:doc/docker/redis.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} secrets: SATIS_NETWORK_KEY: ${{ secrets.SATIS_NETWORK_KEY }}