diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-05-02 17:16:19 -0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-02 17:16:19 -0300 |
| commit | f233e856bfd0d338b3b6b8e0af637ff794b0fb7f (patch) | |
| tree | 56c9c75afcd2ee8e5385cfbf91dfe852aaa52a73 | |
| parent | 24ff230f938bb9c47bbd75a133af84314b42aca7 (diff) | |
| parent | ecb369b5e81fb1a7ba3a91599dd70e907226aa88 (diff) | |
| download | nextcloud-server-f233e856bfd0d338b3b6b8e0af637ff794b0fb7f.tar.gz nextcloud-server-f233e856bfd0d338b3b6b8e0af637ff794b0fb7f.zip | |
Merge pull request #4665 from nextcloud/enable-redis
Add redis support to our CI jobs
| -rw-r--r-- | .drone.yml | 16 | ||||
| -rwxr-xr-x | autotest.sh | 8 | ||||
| -rw-r--r-- | tests/redis.config.php | 12 |
3 files changed, 36 insertions, 0 deletions
diff --git a/.drone.yml b/.drone.yml index 6302736e0d6..490593676b2 100644 --- 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 584b5dc0bd8..fa15597bd55 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 # 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 index 00000000000..2ff46ec6728 --- /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, + ], +]; |