From 1df88dc1f1d61d59f2060afdfba3433315d9f209 Mon Sep 17 00:00:00 2001 From: KamilSznajdrowicz Date: Mon, 5 Oct 2026 10:54:37 +0200 Subject: [PATCH 1/6] [TMP] Run regression --- dependencies.json | 47 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 dependencies.json diff --git a/dependencies.json b/dependencies.json new file mode 100644 index 00000000..67ef022d --- /dev/null +++ b/dependencies.json @@ -0,0 +1,47 @@ +{ + "recipesEndpoint": "", + "packages": [ + { + "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/elasticsearch", + "package": "ibexa/elasticsearch", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/docker", + "package": "ibexa/docker", + "shouldBeAddedAsVCS": false + }, + { + "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/measurement", + "package": "ibexa/measurement", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/product-catalog", + "package": "ibexa/product-catalog", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/taxonomy", + "package": "ibexa/taxonomy", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/product-catalog-date-time-attribute", + "package": "ibexa/product-catalog-date-time-attribute", + "shouldBeAddedAsVCS": true + }, + { + "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", + "repositoryUrl": "https://github.com/ibexa/product-catalog-symbol-attribute", + "package": "ibexa/product-catalog-symbol-attribute", + "shouldBeAddedAsVCS": true + } + ] +} \ No newline at end of file From 8db0c182c02e29f742c5b7379af29a7bcda345c5 Mon Sep 17 00:00:00 2001 From: KamilSznajdrowicz Date: Mon, 5 Oct 2026 11:08:34 +0200 Subject: [PATCH 2/6] [tmp] add ci-scripts --- .github/workflows/browser-tests.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index 279773ef..1b8b11d6 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -23,6 +23,7 @@ jobs: name: "PHP 8.3/Node 22/PostgreSQL 18.0/Varnish/Redis 7.2/Multirepository" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: + ci-scripts-branch: IBX-12267-pin-elasticsearch-8-client project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=commerce" @@ -36,15 +37,16 @@ jobs: timeout: 120 secrets: inherit regression-commerce-setup2: - name: "PHP 8.4/Node 22/MariaDB 11.4/Elastic 8/Valkey latest" + name: "PHP 8.4/Node 22/MariaDB 11.4/Elastic 9/Valkey latest" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: + ci-scripts-branch: IBX-12267-pin-elasticsearch-8-client project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=commerce" test-setup-phase-1: "--profile=regression --suite=setup-commerce --tags=~@part2 --mode=standard" test-setup-phase-2: "--profile=regression --suite=setup-commerce --tags=@part2 --mode=standard" - setup: "doc/docker/base-dev.yml:doc/docker/db-mariadb11.4.yml:doc/docker/elastic8.yml:doc/docker/valkey-latest.yml:doc/docker/selenium.yml" + setup: "doc/docker/base-dev.yml:doc/docker/db-mariadb11.4.yml:doc/docker/elastic.yml:doc/docker/valkey-latest.yml:doc/docker/selenium.yml" send-success-notification: ${{ github.event.inputs.send-success-notification != 'false' }} job-count: 4 multirepository: true @@ -55,6 +57,7 @@ jobs: name: "PHP 8.4/Node 22/MySQL 8.4/Multirepository/Solr 8/Redis latest" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: + ci-scripts-branch: IBX-12267-pin-elasticsearch-8-client project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=commerce" @@ -71,6 +74,7 @@ jobs: name: "Connector-quable tests/PHP 8.4/Node 22/PostgreSQL 18.0" uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main with: + ci-scripts-branch: IBX-12267-pin-elasticsearch-8-client project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} setup: "doc/docker/base-dev.yml:doc/docker/db-postgresql18.yml:doc/docker/selenium.yml" From b9ad39c78c869208c44a6d64ff370fad0d5c107e Mon Sep 17 00:00:00 2001 From: Kamil Sznajdrowicz <93484579+KamilSznajdrowicz@users.noreply.github.com> Date: Mon, 5 Oct 2026 13:46:46 +0200 Subject: [PATCH 3/6] Update dependencies.json --- dependencies.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/dependencies.json b/dependencies.json index 67ef022d..d2d5e297 100644 --- a/dependencies.json +++ b/dependencies.json @@ -36,12 +36,6 @@ "repositoryUrl": "https://github.com/ibexa/product-catalog-date-time-attribute", "package": "ibexa/product-catalog-date-time-attribute", "shouldBeAddedAsVCS": true - }, - { - "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", - "repositoryUrl": "https://github.com/ibexa/product-catalog-symbol-attribute", - "package": "ibexa/product-catalog-symbol-attribute", - "shouldBeAddedAsVCS": true } ] -} \ No newline at end of file +} From cc20003c6061b6e1cd106dc1174279ac559ecfd8 Mon Sep 17 00:00:00 2001 From: Kamil Sznajdrowicz <93484579+KamilSznajdrowicz@users.noreply.github.com> Date: Mon, 5 Oct 2026 15:15:06 +0200 Subject: [PATCH 4/6] Update dependencies.json --- dependencies.json | 6 ------ 1 file changed, 6 deletions(-) diff --git a/dependencies.json b/dependencies.json index d2d5e297..9d4b23ae 100644 --- a/dependencies.json +++ b/dependencies.json @@ -30,12 +30,6 @@ "repositoryUrl": "https://github.com/ibexa/taxonomy", "package": "ibexa/taxonomy", "shouldBeAddedAsVCS": true - }, - { - "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", - "repositoryUrl": "https://github.com/ibexa/product-catalog-date-time-attribute", - "package": "ibexa/product-catalog-date-time-attribute", - "shouldBeAddedAsVCS": true } ] } From ecfa95a34dbc4a9754792b317fd9359251a1efae Mon Sep 17 00:00:00 2001 From: KamilSznajdrowicz Date: Fri, 9 Oct 2026 11:08:34 +0200 Subject: [PATCH 5/6] Switched browser tests to k8s-satis gh-workflows and ci-scripts branches Co-Authored-By: Claude Opus 5.5 (1M context) --- .github/workflows/browser-tests.yml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/browser-tests.yml b/.github/workflows/browser-tests.yml index f307ed76..300184d1 100644 --- a/.github/workflows/browser-tests.yml +++ b/.github/workflows/browser-tests.yml @@ -21,9 +21,9 @@ on: jobs: regression-commerce-setup1: name: "PHP 8.5/Node 22/PostgreSQL 18.0/Varnish/Redis 7.2/Multirepository" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@k8s-satis with: - ci-scripts-branch: IBX-12267-pin-elasticsearch-8-client + ci-scripts-branch: "k8s-satis" project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=commerce" @@ -38,9 +38,9 @@ jobs: secrets: inherit regression-commerce-setup2: name: "PHP 8.5/Node 22/MariaDB 11.4/Elastic 9/Valkey latest" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@k8s-satis with: - ci-scripts-branch: IBX-12267-pin-elasticsearch-8-client + ci-scripts-branch: "k8s-satis" project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=commerce" @@ -55,9 +55,9 @@ jobs: secrets: inherit regression-commerce-setup3: name: "PHP 8.5/Node 22/MySQL 8.4/Multirepository/Solr 8/Redis latest" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@k8s-satis with: - ci-scripts-branch: IBX-12267-pin-elasticsearch-8-client + ci-scripts-branch: "k8s-satis" project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} test-suite: "--profile=regression --suite=commerce" @@ -72,9 +72,9 @@ jobs: secrets: inherit admin-ui-connector-quable: name: "Connector-quable tests/PHP 8.5/Node 22/PostgreSQL 18.0" - uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@main + uses: ibexa/gh-workflows/.github/workflows/browser-tests.yml@k8s-satis with: - ci-scripts-branch: IBX-12267-pin-elasticsearch-8-client + ci-scripts-branch: "k8s-satis" project-edition: "commerce" project-version: ${{ github.event.inputs.project-version }} setup: "doc/docker/base-dev.yml:doc/docker/db-postgresql18.yml:doc/docker/selenium.yml" From 6fbda799bd72385cff517ddd131c9943439ecae7 Mon Sep 17 00:00:00 2001 From: KamilSznajdrowicz Date: Fri, 9 Oct 2026 11:09:46 +0200 Subject: [PATCH 6/6] Set shouldBeAddedAsVCS to false for all dependencies Co-Authored-By: Claude Opus 5.5 (1M context) --- dependencies.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/dependencies.json b/dependencies.json index 9d4b23ae..7cd38886 100644 --- a/dependencies.json +++ b/dependencies.json @@ -5,7 +5,7 @@ "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/elasticsearch", "package": "ibexa/elasticsearch", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", @@ -17,19 +17,19 @@ "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/measurement", "package": "ibexa/measurement", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/product-catalog", "package": "ibexa/product-catalog", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false }, { "requirement": "dev-IBX-12267-elasticsearch-9 as 6.0.x-dev", "repositoryUrl": "https://github.com/ibexa/taxonomy", "package": "ibexa/taxonomy", - "shouldBeAddedAsVCS": true + "shouldBeAddedAsVCS": false } ] }