drop 5.6/7.0 testing

ezsystems · May 21, 2019 · 71a39c0 · 71a39c0
1 parent 8f1731a
commit 71a39c0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,18 +17,14 @@ env:
 matrix:
     fast_finish: true
     include:
-        - php: 5.6
-        - php: 7.0
         - php: 7.1
           env: CHECK_CS=true
         - php: 7.2
         # Functional
-        - php: 7.0
-          env: TEST_CMD="bin/behat --profile=rest --tags=~@broken --suite=fullJson" EZPLATFORM_BRANCH=1.13 PHP_IMAGE=ezsystems/php:7.0-v1
         - php: 7.1
           env: TEST_CMD="bin/behat --profile=rest --tags=~@broken --suite=fullJson"
         - php: 7.2
-          env: TEST_CMD="bin/phpunit -v vendor/ezsystems/ezpublish-kernel/eZ/Bundle/EzPublishRestBundle/Tests/Functional" SYMFONY_CMD="ez:behat:create-language 'pol-PL' 'Polish (polski)'" PHP_IMAGE=ezsystems/php:7.2-v1
+          env: TEST_CMD="bin/phpunit -c vendor/ezsystems/ezplatform-rest/phpunit-integration-rest.xml" SYMFONY_CMD="ez:behat:create-language 'pol-PL' 'Polish (polski)'" PHP_IMAGE=ezsystems/php:7.2-v1
 
 # test only master + stable (+ Pull requests)
 branches:

diff --git a/composer.json b/composer.json
@@ -39,7 +39,7 @@
         ]
     },
     "extra": {
-        "_ezplatform_branch_for_behat_tests": "master",
+        "_ezplatform_branch_for_behat_tests": "EZP-28032-rest-common",
         "branch-alias": {
             "dev-master": "0.10.x-dev",
             "dev-tmp_ci_branch": "0.10.x-dev"

diff --git a/tests/.travis/prepare_for_functional_tests.sh b/tests/.travis/prepare_for_functional_tests.sh
@@ -19,5 +19,5 @@ if [ "$EZPLATFORM_BRANCH" = "1.13" ] ; then
     export RUN_INSTALL=1
     ./bin/.travis/trusty/setup_from_external_repo.sh $PACKAGE_BUILD_DIR "ezsystems/ezplatform-http-cache:dev-tmp_ci_branch"
 else
-    /bin/bash ./bin/.travis/trusty/setup_ezplatform.sh "${COMPOSE_FILE}" '' "${PACKAGE_BUILD_DIR}"
+    /bin/bash ./bin/.travis/trusty/setup_ezplatform.sh "${COMPOSE_FILE}"
 fi