Merge branch 'master' into simplify-config

owncloud · Jun 22, 2020 · b7c4fc7 · b7c4fc7
2 parents 9f9f0f3 + 284a999
commit b7c4fc7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.drone.star b/.drone.star
@@ -180,7 +180,7 @@ def testing(ctx, coreBranch = 'master', coreCommit = '', phoenixBranch = 'master
           'TEST_EXTERNAL_USER_BACKENDS':'true',
           'REVA_LDAP_HOSTNAME':'ldap',
           'TEST_OCIS':'true',
-          'BEHAT_FILTER_TAGS': '~@skipOnOcis&&~@skipOnLDAP&&@TestAlsoOnExternalUserBackend&&~@local_storage',
+          'BEHAT_FILTER_TAGS': '~@skipOnOcis&&~@skipOnOcis-OC-Storage&&~@skipOnLDAP&&@TestAlsoOnExternalUserBackend&&~@local_storage',
         },
         'commands': [
           'git clone -b master --depth=1 https://github.com/owncloud/testing.git /srv/app/tmp/testing',

diff --git a/README.md b/README.md
@@ -31,6 +31,7 @@ make generate build
 ### Redis server
 
 You will need to start a redis server as a cache. The ownCloud storage driver currently will try to connect to the default port.
+A quick way to start one for testing is using this docker instance: `docker run -e REDIS_DATABASES=1 -p 6379:6379 -d webhippie/redis:latest`
 
 ### Root storage