Merge pull request #29425 from owncloud/stable10-drone-enabling-phpun…

…it-mysql [Stable10] Moved mysql php 7.0 job from jenkins to drone
owncloud · Nov 3, 2017 · ec3e98b · ec3e98b
2 parents 996a6a9 + a93493f
commit ec3e98b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 14 deletions.
diff --git a/.drone.yml b/.drone.yml
@@ -127,7 +127,7 @@ services:
         DB_TYPE: mariadb
 
   mysql:
-    image: mysql:5.7
+    image: mysql:5.5
     environment:
       - MYSQL_USER=owncloud
       - MYSQL_PASSWORD=owncloud
@@ -183,9 +183,9 @@ matrix:
     #- PHP_VERSION: 7.0
     #  DB_TYPE: mariadb
     #  TEST_SUITE: phpunit
-    #- PHP_VERSION: 7.0
-    #  DB_TYPE: mysql
-    #  TEST_SUITE: phpunit
+    - PHP_VERSION: 7.0
+      DB_TYPE: mysql
+      TEST_SUITE: phpunit
     #- PHP_VERSION: 7.0
     #  DB_TYPE: postgres
     #  TEST_SUITE: phpunit

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -35,16 +35,6 @@ timestampedNode('SLAVE') {
             '''
         }
 
-    stage 'PHPUnit 7.0/mysql'
-        executeAndReport('tests/autotest-results-mysql.xml') {
-            sh '''
-            export NOCOVERAGE=1
-            unset USEDOCKER
-            phpenv local 7.0
-            make test-php TEST_DATABASE=mysql
-            '''
-        }
-
     stage 'PHPUnit 5.6/pgsql'
         executeAndReport('tests/autotest-results-pgsql.xml') {
             sh '''