From bd90d6b4f5f0d274a2c273966aaf8a093d62cae7 Mon Sep 17 00:00:00 2001 From: Morris Jobke Date: Tue, 2 May 2017 12:44:54 -0300 Subject: [PATCH] Add redis support to our CI jobs Signed-off-by: Morris Jobke --- .drone.yml | 16 +++++++++++++++- autotest.sh | 8 ++++++++ tests/redis.config.php | 12 ++++++++++++ 3 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 tests/redis.config.php diff --git a/.drone.yml b/.drone.yml index e2321c2a863..f406b1e0566 100644 --- a/.drone.yml +++ b/.drone.yml @@ -400,7 +400,9 @@ matrix: - TESTS: signed-off-check - TESTS: htaccess-checker - TESTS: nodb-codecov - - TESTS: db-codecov + ENABLE_REDIS: true + - TESTS: db-codecov + ENABLE_REDIS: true - TESTS: integration-capabilities_features - TESTS: integration-federation_features - TESTS: integration-auth @@ -435,26 +437,38 @@ matrix: - TESTS: carddavtester-old-endpoint - 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 1e45dce2edf..8afc69e57af 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 @@ + '\\OC\\Memcache\\Redis', + 'memcache.distributed' => '\\OC\\Memcache\\Redis', + 'memcache.locking' => '\\OC\\Memcache\\Redis', + 'redis' => [ + 'host' => 'cache', + 'port' => 6379, + 'timeout' => 0, + ], +];