Add redis support to our CI jobs

Signed-off-by: Morris Jobke <hey@morrisjobke.de>

diff --git a/.drone.yml b/.drone.yml
index 6302736e0d6babbf8388cc8e60caaacdca356aa6..490593676b29bef66634693c6fe6dba1ebd24e13 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -553,11 +553,14 @@ matrix:
     - TESTS: translation-check
     - TESTS: htaccess-checker
     - TESTS: nodb-codecov
+      ENABLE_REDIS: true
     - TESTS: db-codecov
+      ENABLE_REDIS: true
     - TESTS: integration-capabilities_features
     - TESTS: integration-federation_features
     - TESTS: integration-maintenance-mode
     - TESTS: integration-ratelimiting
+      ENABLE_REDIS: true
     - TESTS: integration-auth
     - TESTS: integration-carddav
     - TESTS: integration-dav-v2
@@ -605,28 +608,41 @@ matrix:
     - TESTS: sqlite-php7.0-samba-non-native
     - TEST: memcache-memcached
     - TESTS: sqlite-php7.0-webdav-apache
+      ENABLE_REDIS: true
     - DB: NODB
       PHP: 5.6
+      ENABLE_REDIS: true
     - DB: NODB
       PHP: 7.0
+      ENABLE_REDIS: true
     - DB: NODB
       PHP: 7.1
+      ENABLE_REDIS: true
     - DB: sqlite
       PHP: 5.6
+      ENABLE_REDIS: true
     - DB: sqlite
       PHP: 7.0
+      ENABLE_REDIS: true
     - DB: sqlite
       PHP: 7.1
+      ENABLE_REDIS: true
     - DB: mysql
       PHP: 5.6
+      ENABLE_REDIS: true
     - DB: postgres
       PHP: 5.6
+      ENABLE_REDIS: true
     - DB: mysqlmb4
       PHP: 5.6
+      ENABLE_REDIS: true
 
 services:
   cache:
     image: redis
+    when:
+      matrix:
+       ENABLE_REDIS: true
   postgres:
     image: postgres
     environment:

diff --git a/autotest.sh b/autotest.sh
index 584b5dc0bd8f24f839a02324ebe16436eae82d66..fa15597bd559cb480fdd1e503ec5532445341d9a 100755 (executable)
--- a/autotest.sh
+++ b/autotest.sh
@@ -143,6 +143,10 @@ function cleanup_config {
        if [ -f config/autotest-storage-swift.config.php ]; then
                rm config/autotest-storage-swift.config.php
        fi
+       # Remove autotest redis config
+       if [ -f config/redis.config.php ]; then
+               rm config/redis.config.php
+       fi
        # Remove mysqlmb4.config.php
        rm -f config/mysqlmb4.config.php
 }
@@ -178,6 +182,10 @@ function execute_tests {
        fi
        cp tests/preseed-config.php config/config.php
 
+       if [ "$ENABLE_REDIS" == "true" ] ; then
+               cp tests/redis.config.php config/redis.config.php
+       fi
+
        _DB=$DB
 
        # drop database

diff --git a/tests/redis.config.php b/tests/redis.config.php
new file mode 100644 (file)
index 0000000..2ff46ec
--- /dev/null
+++ b/tests/redis.config.php
@@ -0,0 +1,12 @@
+<?php
+
+$CONFIG = [
+       'memcache.local' => '\\OC\\Memcache\\Redis',
+       'memcache.distributed' => '\\OC\\Memcache\\Redis',
+       'memcache.locking' => '\\OC\\Memcache\\Redis',
+       'redis' => [
+               'host' => 'localhost',
+               'port' => 6379,
+               'timeout' => 0,
+       ],
+];