gitlab-ci; use matric for cypress tests

Link to #3630

browser/.gitlab-ci.yml

@@ -3,7 +3,7 @@
   image: vidjilci/cypress_with_browsers:latest
   stage: test_cypress_client
   # extends:
-  #   - .need_for_staged_test
+    # - .need_for_staged_client
   script:
     - echo -e "Run cypress with browser $BROWSER"
     - echo -e "PWD $PWD; CYPRESS_PATH $CYPRESS_PATH"
@@ -33,22 +33,23 @@
 
 
 ## cypress client
-#Launch in order Supported --> latest --> legacy
 # For the moment, need to be into separate stage (https://gitlab.com/gitlab-org/gitlab/-/issues/30632)
-
-test_client_cypress:
+client_early:
   extends:
     - .test_cypress_base
     - .need_for_moderate_client
-  stage: test_cypress_client
+  variables:
+    BROWSER: browsers/firefox_supported/firefox
+
+client_late:
+  extends:
+    - .test_cypress_base
   parallel:
     matrix:
       - BROWSER: [
-        browsers/firefox_supported/firefox,
-        browsers/firefox_latest/firefox,
-        browsers/firefox_legacy/firefox,
-        browsers/chrome_supported/chrome,
-        browsers/chrome_latest/chrome,
-        browsers/chrome_legacy/chrome
+          browsers/firefox_latest/firefox,
+          browsers/firefox_legacy/firefox,
+          browsers/chrome_supported/chrome,
+          browsers/chrome_latest/chrome,
+          browsers/chrome_legacy/chrome
         ]
-

server/.gitlab-ci.yml

 
 .test_cypress_server:
   stage: test_cypress_server
-  # extends:
-  #   - .need_for_staged_test
+  extends:
+    - .test_server_base
+    - .test_cypress_base
+    # - .need_for_staged_server
   script:
     - docker pull "vidjilci/cypress_with_browsers:latest"
     - >
@@ -34,59 +36,23 @@
 
 
 ## Cypress with server
-server_firefox_supported:
+server_early:
   extends:
-    - .test_server_base
-    - .test_cypress_base
     - .test_cypress_server
     - .need_for_moderate_server
-  stage: test_cypress_server
   variables:
     BROWSER: browsers/firefox_supported/firefox
 
-server_firefox_latest:
-  extends:
-    - .test_server_base
-    - .test_cypress_base
-    - .test_cypress_server
-  stage: test_cypress_server
-  variables:
-    BROWSER: browsers/firefox_latest/firefox
-
-server_firefox_legacy:
-  extends:
-    - .test_server_base
-    - .test_cypress_base
-    - .test_cypress_server
-  stage: test_cypress_server
-  variables:
-    BROWSER: browsers/firefox_legacy/firefox
-
-
-server_chrome_supported:
-  extends:
-    - .test_server_base
-    - .test_cypress_base
-    - .test_cypress_server
-  stage: test_cypress_server
-  variables:
-    BROWSER: browsers/chrome_supported/chrome
-
-server_chrome_latest:
-  extends:
-    - .test_server_base
-    - .test_cypress_base
-    - .test_cypress_server
-  stage: test_cypress_server
-  variables:
-    BROWSER: browsers/chrome_latest/chrome
-
-server_chrome_legacy:
+## Cypress with server
+server_late:
   extends:
-    - .test_server_base
-    - .test_cypress_base
     - .test_cypress_server
-  stage: test_cypress_server
-  variables:
-    BROWSER: browsers/chrome_legacy/chrome
-
+  parallel:
+    matrix:
+      - BROWSER: [
+          browsers/firefox_latest/firefox,
+          browsers/firefox_legacy/firefox,
+          browsers/chrome_supported/chrome,
+          browsers/chrome_latest/chrome,
+          browsers/chrome_legacy/chrome
+        ]