From fdc9f8ba8401baa691b8f91c863301ebb778f17e Mon Sep 17 00:00:00 2001
From: Leon Klingele <leon@struktur.de>
Date: Tue, 27 Sep 2016 12:28:52 +0200
Subject: [PATCH] Use Nextcloud for CI tests

---
 .gitlab-ci.yml            |  6 +++---
 .travis.yml               | 18 +++++++++---------
 tests/prepare-ci-tests.sh | 34 +++++++++++++---------------------
 3 files changed, 25 insertions(+), 33 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0a1691..c1e6109 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
-  OWNCLOUD_BRANCH: master
-  OWNCLOUD_DATABASE: mysql
+  NC_BRANCH: master
+  NC_DATABASE: mysql
 
 runtests:
   script:
@@ -8,6 +8,6 @@ runtests:
     - ci-apt-get-update
     - ci-apt-get-install mysql-client mysql-server phpunit php5-curl php5-gd php5-intl php5-mysql
     - ./tests/prepare-ci-tests.sh
-    - cd ${CI_PROJECT_DIR}/../owncloud/apps/spreedme
+    - cd ${CI_PROJECT_DIR}/../nextcloud/apps/spreedme
     - phpunit -c phpunit.xml
     - phpunit -c phpunit.integration.xml
diff --git a/.travis.yml b/.travis.yml
index 47cd281..891ddae 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,32 +8,32 @@ php:
 
 env:
   global:
-    - OWNCLOUD_BRANCH=master
+    - NC_BRANCH=master
   matrix:
-    - OWNCLOUD_DATABASE=mysql
+    - NC_DATABASE=mysql
 
 matrix:
   allow_failures:
     - php: hhvm
   include:
     - php: 5.5
-      env: OWNCLOUD_DATABASE=sqlite
+      env: NC_DATABASE=sqlite
     - php: 5.5
-      env: OWNCLOUD_DATABASE=pgsql
+      env: NC_DATABASE=pgsql
     - php: 5.6
-      env: OWNCLOUD_DATABASE=sqlite
+      env: NC_DATABASE=sqlite
     - php: 5.6
-      env: OWNCLOUD_DATABASE=pgsql
+      env: NC_DATABASE=pgsql
     - php: 7.0
-      env: OWNCLOUD_DATABASE=sqlite
+      env: NC_DATABASE=sqlite
     - php: 7.0
-      env: OWNCLOUD_DATABASE=pgsql
+      env: NC_DATABASE=pgsql
 
 install:
   - phpenv config-add tests/travis/php.ini
   - ./tests/prepare-ci-tests.sh
 
 script:
-  - cd ${TRAVIS_BUILD_DIR}/../owncloud/apps/spreedme
+  - cd ${TRAVIS_BUILD_DIR}/../nextcloud/apps/spreedme
   - phpunit -c phpunit.xml
   - phpunit -c phpunit.integration.xml
diff --git a/tests/prepare-ci-tests.sh b/tests/prepare-ci-tests.sh
index 2605fee..09d92e6 100755
--- a/tests/prepare-ci-tests.sh
+++ b/tests/prepare-ci-tests.sh
@@ -1,13 +1,13 @@
 #!/bin/bash
 set -eu
 
-if [ -z "${OWNCLOUD_BRANCH:-}" ]; then
-    echo "No ownclound branch specified."
+if [ -z "${NC_BRANCH:-}" ]; then
+    echo "No Nextcloud branch specified."
     exit 1
 fi
 
-if [ -z "${OWNCLOUD_DATABASE:-}" ]; then
-    echo "No ownclound database specified."
+if [ -z "${NC_DATABASE:-}" ]; then
+    echo "No Nextcloud database specified."
     exit 1
 fi
 
@@ -40,15 +40,7 @@ fi
 
 pushd "${PROJECT_ROOT}"
 
-echo "Installing ocdev ..."
-${SUDO} ${APT_GET_INSTALL} \
-    python3-jinja2 \
-    python3-setuptools
-
-${SUDO} easy_install3 requests==2.10.0
-${SUDO} easy_install3 ocdev
-
-case "${OWNCLOUD_DATABASE}" in
+case "${NC_DATABASE}" in
     pgsql)
         echo "Setting up postgresql ..."
         createuser -s oc_autotest
@@ -66,27 +58,27 @@ case "${OWNCLOUD_DATABASE}" in
         ;;
 
     *)
-        echo "No additional setup required for ${OWNCLOUD_DATABASE}"
+        echo "No additional setup required for ${NC_DATABASE}"
         ;;
 esac
 
-echo "Installing owncloud ..."
+echo "Installing Nextcloud ..."
 cd ..
-rm -rf owncloud
-ocdev setup core --dir owncloud --branch "${OWNCLOUD_BRANCH}" --no-history
-cp -r "${PROJECT_ROOT}" owncloud/apps/spreedme
-cd owncloud/apps/spreedme
+rm -rf nextcloud
+git clone https://github.com/nextcloud/server.git --recursive --depth 1 -b $NC_BRANCH nextcloud
+cp -r "${PROJECT_ROOT}" nextcloud/apps/spreedme
+cd nextcloud/apps/spreedme
 cp config/config.php.in config/config.php
 cp extra/static/config/OwnCloudConfig.js.in extra/static/config/OwnCloudConfig.js
 cd ../../..
-cd owncloud
+cd nextcloud
 ./occ -vvv maintenance:install \
     --database-name oc_autotest \
     --database-user oc_autotest \
     --database-pass \
     --admin-user admin \
     --admin-pass admin \
-    --database "${OWNCLOUD_DATABASE}"
+    --database "${NC_DATABASE}"
 
 echo "Enabling spreedme app ..."
 ./occ app:enable spreedme