Merge pull request #930 from owncloud/travis-trusty

Migrate to trusty vm for travis

7 files changed, 17 insertions, 91 deletions

diff --git a/.travis.yml b/.travis.yml
index 0e6f5283a..a00611bac 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,9 +1,10 @@
+sudo: required
+dist: trusty
 language: php
 php:
     - 5.5
     - 5.6
     - 7
-    #- hhvm
 env:
     global:
         - CORE_BRANCH=stable8.2
@@ -12,26 +13,22 @@ env:
 
 matrix:
     allow_failures:
-        - php: hhvm
         - env: DB=pgsql CORE_BRANCH=master
     include:
-        - php: 5.5
+        - php: 5.6
           env: DB=sqlite
-        - php: 5.5
+        - php: 5.6
           env: DB=mysql
         # master branch
-        - php: 5.5
+        - php: 5.6
           env: DB=pgsql CORE_BRANCH=master
     fast_finish: true
 
 before_install:
-    - "export DISPLAY=:99.0"
-    - "sh -e /etc/init.d/xvfb start"
-
-install:
-    # install dependencies
+    - export DISPLAY=:99.0
+    - sh -e /etc/init.d/xvfb start
     - sudo apt-get update
-    - sudo apt-get install -o DPkg::Options::="--force-confold" -y libxml2 libxml2-dev libxml2-utils python3-jinja2 python3-setuptools apache2 libapache2-mod-fastcgi firefox curl
+    - sudo apt-get -y install python3-setuptools firefox mariadb-server
     - sudo easy_install3 requests ocdev
     - nvm install 5.6
     - npm install -g npm@latest
@@ -47,20 +44,17 @@ install:
     - mv news owncloud/apps/
 
 before_script:
-    - phpenv config-add owncloud/apps/news/tests/travis/php.ini
-    # set up databases and users for postgres and mysql
     - createuser -U travis -s oc_autotest
-    - mysql -e 'create database oc_autotest;'
+    - mysql -u root -e 'create database oc_autotest;'
     - mysql -u root -e "CREATE USER 'oc_autotest'@'localhost' IDENTIFIED BY '';"
     - mysql -u root -e "grant all on oc_autotest.* to 'oc_autotest'@'localhost';"
-    # set up php under apache
-    - bash owncloud/apps/news/tests/travis/travis-ci-apache.sh
     # fill owncloud with default configs and enable news
     - cd owncloud
     - mkdir data
     - ./occ maintenance:install --database-name oc_autotest --database-user oc_autotest --admin-user admin --admin-pass admin --database $DB --database-pass=''
     - ./occ app:enable news
     - ./occ background:cron  # enable default cron
+    - ocdev server &
     - cd apps/news
 
 script:
@@ -71,14 +65,6 @@ script:
     - cd js
     - gulp karma
     # acceptance tests
-    # - webdriver-manager update
-    - sudo chown -R www-data:www-data ../../../data
-    - sudo chmod -R a+rwx ../../../data
-    #- grunt acceptance --verbose
+    #- webdriver-manager update
     # debug section to check what went wrong
-    - curl http://admin:admin@localhost/owncloud/index.php
-    - curl http://admin:admin@localhost/owncloud/index.php/apps/news/
     - sudo cat ../../../data/owncloud.log
-
-addons:
-    postgresql: "9.3"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe22b5f5d..54f019157 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+owncloud-news (7.2.0)
+* **New dependency**: Bump required PostgreSQL version to 9.4
+* **New dependency**: Bump required MySql/MariaDB version to 5.5
+
 owncloud-news (7.1.2)
 * **Enhancement**: Major JavaScript library updates:
   * Update from Angular 1.3 to 1.5
diff --git a/appinfo/info.xml b/appinfo/info.xml
index f3fcb793a..c44ff78e2 100644
--- a/appinfo/info.xml
+++ b/appinfo/info.xml
@@ -25,9 +25,9 @@
     <dependencies>
         <owncloud min-version="8.2" max-version="9.0"/>
         <php min-version="5.5" />
-        <database min-version="9.3">pgsql</database>
+        <database min-version="9.4">pgsql</database>
         <database>sqlite</database>
-        <database>mysql</database>
+        <database min-version="5.5">mysql</database>
         <lib min-version="2.7.8">libxml</lib>
         <lib>curl</lib>
         <lib>SimpleXML</lib>
diff --git a/tests/travis/php.ini b/tests/travis/php.ini
deleted file mode 100644
index 09fc2d51c..000000000
--- a/tests/travis/php.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-default_charset = "UTF-8"
-always_populate_raw_post_data = -1
diff --git a/tests/travis/travis-ci-apache-hhvm.conf b/tests/travis/travis-ci-apache-hhvm.conf
deleted file mode 100644
index dbfbfae2c..000000000
--- a/tests/travis/travis-ci-apache-hhvm.conf
+++ /dev/null
@@ -1,25 +0,0 @@
-<VirtualHost *:80>
-
-  DocumentRoot %TRAVIS_BUILD_DIR%
-
-  <Directory "%TRAVIS_BUILD_DIR%">
-    Options FollowSymLinks MultiViews ExecCGI
-    AllowOverride All
-    Order deny,allow
-    Allow from all
-  </Directory>
-
-  # Configure Apache for HHVM FastCGI.
-  # See https://github.com/facebook/hhvm/wiki/fastcgi.
-  <IfModule mod_fastcgi.c>
-      <FilesMatch \.php$>
-          SetHandler hhvm-php-extension
-      </FilesMatch>
-
-      Alias /hhvm /hhvm
-      Action hhvm-php-extension /hhvm virtual
-
-      FastCgiExternalServer /hhvm -host 127.0.0.1:9000 -pass-header Authorization -idle-timeout 300
-  </IfModule>
-
-</VirtualHost>
diff --git a/tests/travis/travis-ci-apache.conf b/tests/travis/travis-ci-apache.conf
deleted file mode 100644
index 5cfd3ccd0..000000000
--- a/tests/travis/travis-ci-apache.conf
+++ /dev/null
@@ -1,19 +0,0 @@
-<VirtualHost *:80>
-
-  DocumentRoot %TRAVIS_BUILD_DIR%
-
-  <Directory "%TRAVIS_BUILD_DIR%">
-    Options FollowSymLinks MultiViews ExecCGI
-    AllowOverride All
-    Order deny,allow
-    Allow from all
-  </Directory>
-
-  <IfModule mod_fastcgi.c>
-    AddHandler php5-fcgi .php
-    Action php5-fcgi /php5-fcgi
-    Alias /php5-fcgi /usr/lib/cgi-bin/php5-fcgi
-    FastCgiExternalServer /usr/lib/cgi-bin/php5-fcgi -host 127.0.0.1:9000 -pass-header Authorization
-  </IfModule>
-
-</VirtualHost>
\ No newline at end of file
diff --git a/tests/travis/travis-ci-apache.sh b/tests/travis/travis-ci-apache.sh
deleted file mode 100644
index 24af96be5..000000000
--- a/tests/travis/travis-ci-apache.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# set up php under apache
-if [[ $(phpenv version-name) == 'hhvm' ]]; then
-    sudo a2enmod rewrite actions fastcgi alias
-    sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache-hhvm.conf /etc/apache2/sites-available/default
-    sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
-    sudo service apache2 restart
-    hhvm -m daemon -vServer.Type=fastcgi -vServer.Port=9000 -vServer.FixPathInfo=true
-else
-    sudo cp ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf.default ~/.phpenv/versions/$(phpenv version-name)/etc/php-fpm.conf
-    sudo a2enmod rewrite actions fastcgi alias
-    echo "cgi.fix_pathinfo = 1" >> ~/.phpenv/versions/$(phpenv version-name)/etc/php.ini
-    ~/.phpenv/versions/$(phpenv version-name)/sbin/php-fpm
-    sudo cp -f owncloud/apps/news/tests/travis/travis-ci-apache.conf /etc/apache2/sites-available/default
-    sudo sed -e "s?%TRAVIS_BUILD_DIR%?$(pwd)?g" --in-place /etc/apache2/sites-available/default
-    sudo service apache2 restart
-fi
-
-