Add UI tests to upgrade from 172 to 1.7.8.11

PrestaShop · Jul 10, 2024 · 3b08087 · 3b08087
1 parent 0869e9d
commit 3b08087
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 8 deletions.
diff --git a/.github/workflows/ui-test.yml b/.github/workflows/ui-test.yml
@@ -37,7 +37,7 @@ jobs:
       fail-fast: false
       matrix: ${{ fromJSON(needs.ui_test_matrix.outputs.matrix) }}
     env:
-      PS_DOCKER: ${{ matrix.PS_VERSION_START }}-${{ matrix.PHP_VERSION }}
+      PS_DOCKER: ${{ matrix.IMG_DOCKER }}
     steps:
       - name: Checkout
         uses: actions/[email protected]
@@ -61,7 +61,7 @@ jobs:
       - name: Upgrade
         run: |
          docker exec -t prestashop php modules/autoupgrade/cli-upgrade.php --dir=admin-dev --channel=${{ matrix.UPGRADE_CHANNEL }}
-         docker exec -t prestashop chmod 777 -R /var/www/html/var/cache/dev
+         docker exec -t prestashop chmod 777 -R /var/www/html/var/cache/
 
       - name: Install dependencies
         working-directory: tests/UI/

diff --git a/.github/workflows/ui-test/sanity.json b/.github/workflows/ui-test/sanity.json
@@ -1,13 +1,59 @@
 {
   "include": [
+    {
+      "comment": "1.7.2 ~ minor PHP 7.1"
+    },
+    {
+      "PS_VERSION_START": "1.7.2.0",
+      "PS_VERSION_END": "1.7.8.11",
+      "UPGRADE_CHANNEL": "minor",
+      "PHP_VERSION": "7.1",
+      "IMG_DOCKER": "1.7.2.0"
+    },
+    {
+      "PS_VERSION_START": "1.7.2.1",
+      "PS_VERSION_END": "1.7.8.11",
+      "UPGRADE_CHANNEL": "minor",
+      "PHP_VERSION": "7.1",
+      "IMG_DOCKER": "1.7.2.1"
+    },
+    {
+      "PS_VERSION_START": "1.7.2.2",
+      "PS_VERSION_END": "1.7.8.11",
+      "UPGRADE_CHANNEL": "minor",
+      "PHP_VERSION": "7.1",
+      "IMG_DOCKER": "1.7.2.2"
+    },
+    {
+      "PS_VERSION_START": "1.7.2.3",
+      "PS_VERSION_END": "1.7.8.11",
+      "UPGRADE_CHANNEL": "minor",
+      "PHP_VERSION": "7.1",
+      "IMG_DOCKER": "1.7.2.3"
+    },
+    {
+      "PS_VERSION_START": "1.7.2.4",
+      "PS_VERSION_END": "1.7.8.11",
+      "UPGRADE_CHANNEL": "minor",
+      "PHP_VERSION": "7.1",
+      "IMG_DOCKER": "1.7.2.4"
+    },
+    {
+      "PS_VERSION_START": "1.7.2.5",
+      "PS_VERSION_END": "1.7.8.11",
+      "UPGRADE_CHANNEL": "minor",
+      "PHP_VERSION": "7.1",
+      "IMG_DOCKER": "1.7.2.5"
+    },
     {
       "comment": "1.7.8 ~ minor PHP 7.2 ~ 7.4"
     },
     {
       "PS_VERSION_START": "1.7.8.10",
       "PS_VERSION_END": "1.7.8.11",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "7.4"
+      "PHP_VERSION": "7.4",
+      "IMG_DOCKER": "1.7.8.10-7.4-apache"
     },
     {
       "comment": "1.7.8 ~ major PHP 7.2 ~ 7.4"
@@ -16,7 +62,8 @@
       "PS_VERSION_START": "1.7.8.11",
       "PS_VERSION_END": "8.1.7",
       "UPGRADE_CHANNEL": "major",
-      "PHP_VERSION": "7.4"
+      "PHP_VERSION": "7.4",
+      "IMG_DOCKER": "1.7.8.11-7.4-apache"
     },
     {
       "comment": "8.0.5 ~ minor PHP 7.2 ~ 8.1"
@@ -25,7 +72,8 @@
       "PS_VERSION_START": "8.0.5",
       "PS_VERSION_END": "8.1.7",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "8.1"
+      "PHP_VERSION": "8.1",
+      "IMG_DOCKER": "8.0.5-8.1-apache"
     },
     {
       "comment": "8.1.6 ~ minor PHP 7.2 ~ 8.1"
@@ -34,7 +82,8 @@
       "PS_VERSION_START": "8.1.6",
       "PS_VERSION_END": "8.1.7",
       "UPGRADE_CHANNEL": "minor",
-      "PHP_VERSION": "8.1"
+      "PHP_VERSION": "8.1",
+      "IMG_DOCKER": "8.1.6-8.1-apache"
     }
   ]
-}
+}
diff --git 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