From f2a94bc8af0eea2533b7ddc3794a2426e0ca73ba Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Wed, 10 Jul 2024 17:53:34 +0200 Subject: [PATCH 1/2] Add UI tests to upgrade from 171 to 1.7.8.11 --- .github/workflows/ui-test/sanity.json | 27 +++++++++++++++++++++++++++ tests/UI/docker-compose.yml | 2 +- 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index 1b45407b8..83a33f297 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,6 +1,33 @@ { "include": [ { + "comment": "1.7.1 ~ minor PHP 7.1" + }, + { + "PS_VERSION_START": "1.7.0.0", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.0.0" + }, + { + "PS_VERSION_START": "1.7.0.1", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.0.1" + }, + { + "PS_VERSION_START": "1.7.0.2", + "PS_VERSION_END": "1.7.8.11", + "UPGRADE_CHANNEL": "minor", + "PHP_VERSION": "7.1", + "IMG_DOCKER": "1.7.0.2" + }, + { + "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" + "comment": "1.7.8 ~ minor PHP 7.4" + "comment": "1.7.8.10 -> 1.7.8.11 PHP 7.1" "comment": "1.7.6.0 -> 1.7.8.11 PHP 7.1 online" }, { diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml index f86e9a96c..0d73d8cfd 100644 --- a/tests/UI/docker-compose.yml +++ b/tests/UI/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: prestashop: - image: prestashop/prestashop:${PS_VERSION}-apache + image: prestashop/prestashop:${PS_VERSION} container_name: prestashop depends_on: - mysql From 79c024e41d99608f24284efe21a63f70ad3fa5b0 Mon Sep 17 00:00:00 2001 From: nesrineabdmouleh Date: Wed, 10 Jul 2024 18:36:06 +0200 Subject: [PATCH 2/2] Add tests to nightly --- .github/workflows/ui-test.yml | 13 +++++++------ .github/workflows/ui-test/nightly.json | 21 ++++++++++++++++++++ .github/workflows/ui-test/sanity.json | 27 -------------------------- tests/UI/docker-compose.yml | 2 +- 4 files changed, 29 insertions(+), 34 deletions(-) diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml index 68ae70d92..c0ca6c68b 100644 --- a/.github/workflows/ui-test.yml +++ b/.github/workflows/ui-test.yml @@ -57,11 +57,6 @@ jobs: - name: Composer install run: composer install - - name: Install module autoupgrade - working-directory: tests/UI/ - run: | - docker exec -t prestashop php -v bin/console prestashop:module install autoupgrade - - name: Backup run: | docker exec -t prestashop php modules/autoupgrade/bin/console backup:create admin-dev @@ -73,7 +68,7 @@ jobs: docker exec -t prestashop curl --fail -L https://api.prestashop.com/xml/md5/${{ matrix.PS_VERSION_END }}.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml - name: Download local ZIP and XML for local channel in 9.0.0 - if: matrix.PS_VERSION_END == '9.0.0' + if: matrix.PS_VERSION_END == '9.0.0' run: | docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly_9.0.x.zip -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.zip docker exec -t prestashop curl --fail -L https://storage.googleapis.com/prestashop-core-nightly/nightly_9.0.x.xml -o admin-dev/autoupgrade/download/prestashop_${{ matrix.PS_VERSION_END }}.xml @@ -95,6 +90,12 @@ jobs: docker exec -t prestashop php modules/autoupgrade/bin/console update:start --config-file-path=modules/autoupgrade/config.json --channel=${{ matrix.UPGRADE_CHANNEL }} admin-dev docker exec -t prestashop chmod 777 -R /var/www/html/var + - name: Uninstall welcome module + if: matrix.PS_VERSION_START == '1.7.1.0' || matrix.PS_VERSION_START == '1.7.1.1' || matrix.PS_VERSION_START == '1.7.1.2' + run: | + docker exec -t prestashop php bin/console prestashop:module disable welcome + docker exec -t prestashop chmod 777 -R /var/www/html/var + - name: Install dependencies working-directory: tests/UI/ run: npm ci diff --git a/.github/workflows/ui-test/nightly.json b/.github/workflows/ui-test/nightly.json index e7eb412ff..af7c80387 100644 --- a/.github/workflows/ui-test/nightly.json +++ b/.github/workflows/ui-test/nightly.json @@ -1,5 +1,26 @@ { "include": [ + { + "comment": "1.7.1.0 ~ 1.7.1.2 -> 1.7.8.11 PHP 7.1" + }, + { + "PS_VERSION_START": "1.7.1.0", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1", + "UPGRADE_CHANNEL": "online" + }, + { + "PS_VERSION_START": "1.7.1.1", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1", + "UPGRADE_CHANNEL": "online" + }, + { + "PS_VERSION_START": "1.7.1.2", + "PS_VERSION_END": "1.7.8.11", + "PHP_VERSION": "7.1", + "UPGRADE_CHANNEL": "online" + }, { "comment": "1.7.2.0 ~ 1.7.2.5 -> 1.7.8.11 PHP 7.1 online" }, diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json index 83a33f297..1b45407b8 100644 --- a/.github/workflows/ui-test/sanity.json +++ b/.github/workflows/ui-test/sanity.json @@ -1,33 +1,6 @@ { "include": [ { - "comment": "1.7.1 ~ minor PHP 7.1" - }, - { - "PS_VERSION_START": "1.7.0.0", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1", - "IMG_DOCKER": "1.7.0.0" - }, - { - "PS_VERSION_START": "1.7.0.1", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1", - "IMG_DOCKER": "1.7.0.1" - }, - { - "PS_VERSION_START": "1.7.0.2", - "PS_VERSION_END": "1.7.8.11", - "UPGRADE_CHANNEL": "minor", - "PHP_VERSION": "7.1", - "IMG_DOCKER": "1.7.0.2" - }, - { - "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4" - "comment": "1.7.8 ~ minor PHP 7.4" - "comment": "1.7.8.10 -> 1.7.8.11 PHP 7.1" "comment": "1.7.6.0 -> 1.7.8.11 PHP 7.1 online" }, { diff --git a/tests/UI/docker-compose.yml b/tests/UI/docker-compose.yml index 0d73d8cfd..f86e9a96c 100644 --- a/tests/UI/docker-compose.yml +++ b/tests/UI/docker-compose.yml @@ -2,7 +2,7 @@ version: '3.7' services: prestashop: - image: prestashop/prestashop:${PS_VERSION} + image: prestashop/prestashop:${PS_VERSION}-apache container_name: prestashop depends_on: - mysql