Change to -base/run.sh; Remove useless unittest for different mysql versions;...

Change to -base/run.sh; Remove useless unittest for different mysql versions; Add mariadb tests for integration tests

module/merge-request/integration-tests.yml

@@ -12,11 +12,11 @@ php73-sql57-es7-integration-mr:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.6, 2.3.7, 2.4.1, 2.4.2]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - merge_requests
   except:
@@ -36,11 +36,11 @@ php74-sql57-es7-integration-mr:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.7, 2.4.1, 2.4.2 ]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - merge_requests
   except:
@@ -60,12 +60,36 @@ php74-sql80-es7-integration-mr:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.7, 2.4.1, 2.4.2 ]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - merge_requests
   except:
     - schedules
+
+php74-mariadb104-es7-integration-mr:
+  stage: integration-tests
+  tags:
+    - php74
+    - mariadb104
+    - es7
+  variables:
+    DISPLAY_VARS: "YES"
+    EXECUTOR_SUITE: module-integration
+  parallel:
+    matrix:
+      -   MAGENTO_EDITION: [ community, enterprise ]
+          MAGENTO_VERSION: [ 2.3.7, 2.4.1, 2.4.2 ]
+  before_script:
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
+  script:
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
+  after_script:
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
+  only:
+    - merge_requests
+  except:
+    - schedules
\ No newline at end of file

module/merge-request/semver-tests.yml

@@ -14,11 +14,11 @@ semver-tests-mr:
     EXECUTOR_SUITE: module-semver
     ALLOWED_CHANGE_LEVEL: $SEMVER_ALLOWED_CHANGE_LEVEL
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - merge_requests
   except:

module/merge-request/static-tests.yml

@@ -2,7 +2,7 @@ static-tests-mr:
   stage: static-tests
   tags:
     - php74
-    - mysql80
+    - mariadb104
     - es7
   variables:
     DISPLAY_VARS: "YES"
@@ -12,11 +12,11 @@ static-tests-mr:
       - MAGENTO_EDITION: [community]
         MAGENTO_VERSION: [2.4.*]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - merge_requests
   except:

module/merge-request/unit-tests.yml

@@ -12,35 +12,11 @@ php73-sql57-es7-unit-mr:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.6, 2.3.7, 2.4.1, 2.4.2 ]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
-  only:
-    - merge_requests
-  except:
-    - schedules
-
-php74-sql57-es7-unit-mr:
-  stage: unit-tests
-  tags:
-    - php74
-    - mysql57
-    - es7
-  variables:
-    DISPLAY_VARS: "YES"
-    EXECUTOR_SUITE: module-unit
-  parallel:
-    matrix:
-      -   MAGENTO_EDITION: [ community, enterprise ]
-          MAGENTO_VERSION: [ 2.3.7, 2.4.1, 2.4.2 ]
-  before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
-  script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
-  after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - merge_requests
   except:
@@ -60,11 +36,11 @@ php74-sql80-es7-unit-mr:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.7, 2.4.1, 2.4.2 ]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - merge_requests
   except:

module/nightly-build/integration-tests.yml

@@ -12,11 +12,11 @@ php73-sql57-es7-integration-nb:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.*, 2.4.*]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - schedules
   except:
@@ -36,11 +36,11 @@ php74-sql57-es7-integration-nb:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.*, 2.4.* ]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - schedules
   except:
@@ -60,11 +60,35 @@ php74-sql80-es7-integration-nb:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.*, 2.4.* ]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
+  only:
+    - schedules
+  except:
+    - merge_requests
+
+php74-mariadb104-es7-integration-nb:
+  stage: integration-tests
+  tags:
+    - php74
+    - mariadb104
+    - es7
+  variables:
+    DISPLAY_VARS: "YES"
+    EXECUTOR_SUITE: module-integration
+  parallel:
+    matrix:
+      -   MAGENTO_EDITION: [ community, enterprise ]
+          MAGENTO_VERSION: [ 2.3.*, 2.4.* ]
+  before_script:
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
+  script:
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
+  after_script:
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - schedules
   except:

module/nightly-build/static-tests.yml

@@ -12,11 +12,11 @@ static-tests-nb:
       - MAGENTO_EDITION: [community]
         MAGENTO_VERSION: [2.4.*]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - schedules
   except:

module/nightly-build/unit-tests.yml

@@ -12,35 +12,11 @@ php73-sql57-es7-unit-nb:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.*, 2.4.* ]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
-  only:
-    - schedules
-  except:
-    - merge_requests
-
-php74-sql57-es7-unit-nb:
-  stage: unit-tests
-  tags:
-    - php74
-    - mysql57
-    - es7
-  variables:
-    DISPLAY_VARS: "YES"
-    EXECUTOR_SUITE: module-unit
-  parallel:
-    matrix:
-      -   MAGENTO_EDITION: [ community, enterprise ]
-          MAGENTO_VERSION: [ 2.3.*, 2.4.* ]
-  before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
-  script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
-  after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - schedules
   except:
@@ -60,11 +36,11 @@ php74-sql80-es7-unit-nb:
       -   MAGENTO_EDITION: [ community, enterprise ]
           MAGENTO_VERSION: [ 2.3.*, 2.4.* ]
   before_script:
-    - ~/.composer/vendor/met/test-executor/run.sh setup
+    - ~/.composer/vendor/met/test-executor-base/run.sh setup
   script:
-    - ~/.composer/vendor/met/test-executor/run.sh tests
+    - ~/.composer/vendor/met/test-executor-base/run.sh tests
   after_script:
-    - ~/.composer/vendor/met/test-executor/run.sh cleanup
+    - ~/.composer/vendor/met/test-executor-base/run.sh cleanup
   only:
     - schedules
   except: