Merge pull request #778 from nesrineabdmouleh/upgrade171to17811

UI tests - Add PS versions from 1.7.1.0 ~ 1.7.1.2 to 1.7.8.11 (minor) on php 7.1
PrestaShop · Dec 13, 2024 · 15a64ac · 15a64ac
2 parents fb9d70e + 79c024e
commit 15a64ac
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 6 deletions.
diff --git 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
@@ -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"
     },