diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-05-02 12:44:54 -0300 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2017-07-16 10:38:16 +0200 |
| commit | 65eeaa11d7b8c7f5276fcf382bb6cf803fc9f941 (patch) | |
| tree | 96e1e81ca516962e1d68480a9a90bcb50b156738 | |
| parent | 103b2f14f9dd5be90809f8acc33b107dcdec380a (diff) | |
| download | nextcloud-server-65eeaa11d7b8c7f5276fcf382bb6cf803fc9f941.tar.gz nextcloud-server-65eeaa11d7b8c7f5276fcf382bb6cf803fc9f941.zip | |
Add redis support to our CI jobs
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| -rw-r--r-- | .drone.yml | 13 | ||||
| -rwxr-xr-x | autotest.sh | 8 | ||||
| -rw-r--r-- | tests/redis.config.php | 12 |
3 files changed, 33 insertions, 0 deletions
diff --git a/.drone.yml b/.drone.yml index 547a7ef0cec..43f185678f6 100644 --- a/.drone.yml +++ b/.drone.yml @@ -214,28 +214,41 @@ matrix: - TESTS: carddavtester-old-endpoint - DB: NODB PHP: 5.4 + ENABLE_REDIS: true - DB: NODB PHP: 5.5 + ENABLE_REDIS: true - DB: NODB PHP: 5.6 + ENABLE_REDIS: true - DB: NODB PHP: 7.0 + ENABLE_REDIS: true - DB: sqlite PHP: 5.4 + ENABLE_REDIS: true - DB: sqlite PHP: 5.5 + ENABLE_REDIS: true - DB: sqlite PHP: 5.6 + ENABLE_REDIS: true - DB: sqlite PHP: 7.0 + ENABLE_REDIS: true - DB: mysql PHP: 5.6 + ENABLE_REDIS: true - DB: postgres 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 be65ae165a1..a90376e4c0e 100755 --- 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 } # restore config on exit @@ -176,6 +180,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 index 00000000000..9d3f1eca63e --- /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' => 'cache', + 'port' => 6379, + 'timeout' => 0, + ], +]; |