fix(ci) use no phpunit filter instead of matchall filter as default

Change-Id: I9b5111a4e621c43428d433f175a6107649e41f45 Reviewed-on: http://gerrit.tine20.com/customers/17347 Tested-by: Milan Mertens <m.mertens@metaways.de> Reviewed-by: Milan Mertens <m.mertens@metaways.de>
tine20 · Jul 22, 2020 · b8feab0 · b8feab0
1 parent e68529c
commit b8feab0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -99,7 +99,7 @@ workflow:
     - when: never
   script:
     - cd $TINE20ROOT/tests/tine20/
-    - php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --exclude-group longrunning,needsbuild,nogitlabci --filter "${PHPUNIT_FILTER}" AllServerTests
+    - if test -z "${PHPUNIT_FILTER}"; then php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --exclude-group longrunning,needsbuild,nogitlabci AllServerTests; else php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --filter "${PHPUNIT_FILTER}" --exclude-group longrunning,needsbuild,nogitlabci AllServerTests; fi
   artifacts:
     paths:
       - tine20.log
@@ -165,7 +165,7 @@ workflow:
     - when: never
   script:
     - cd $TINE20ROOT/tests/tine20/
-    - php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --group nogitlabci --filter "${PHPUNIT_FILTER}" AllTests
+    - if test -z "${PHPUNIT_FILTER}"; then php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --group nogitlabci AllTests; else php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --group nogitlabci --filter "${PHPUNIT_FILTER}" AllTests; fi
   artifacts:
     paths:
       - tine20.log
@@ -181,7 +181,7 @@ workflow:
     name: "$REGISTRY/test-built-commit:$CI_PIPELINE_ID-$PHP_IMAGE_TAG"
   script:
     - cd $TINE20ROOT/tests/tine20/
-    - php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --exclude-group longrunning,needsbuild,nogitlabci_ldap --filter "${PHPUNIT_FILTER}" AllTests
+    - if test -z "${PHPUNIT_FILTER}"; then php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --exclude-group longrunning,needsbuild,nogitlabci_ldap AllTests; else php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --filter "${PHPUNIT_FILTER}" --exclude-group longrunning,needsbuild,nogitlabci_ldap AllTests; fi
   artifacts:
     paths:
       - tine20.log

diff --git a/ci/abstract_jobs.yml b/ci/abstract_jobs.yml
@@ -63,7 +63,7 @@
     - supervisord
   script:
     - cd $TINE20ROOT/tests/tine20/
-    - php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --exclude-group longrunning,needsbuild,nogitlabci --filter "${PHPUNIT_FILTER}" AllTests
+    - if test -z "${PHPUNIT_FILTER}"; then php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --exclude-group longrunning,needsbuild,nogitlabci AllTests; else php $TINE20ROOT/tine20/vendor/bin/phpunit --color --debug --filter "${PHPUNIT_FILTER}" --exclude-group longrunning,needsbuild,nogitlabci AllTests; fi
   artifacts:
     paths:
       - tine20.log

diff --git a/ci/ci-config.yml b/ci/ci-config.yml
@@ -19,4 +19,4 @@ variables:
   NO_PUSH: "false"
   CUSTOM_APP_VENDOR: "metaways"
   CUSTOM_APP_VERSION: "dev-master"
-  PHPUNIT_FILTER: ".*"
+  PHPUNIT_FILTER: ""