wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add v3.0 auth run

Browse source 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2018-02-21 14:48:10 +01:00 committed by Robin Appelman
parent 31dd6d6aae
commit 4bcc282a48
No known key found for this signature in database
GPG key ID: 42B69D8A64526EFB
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.drone.yml
View file

@ -755,6 +755,10 @@ matrix:
OBJECT_STORE: s3
- TESTS: object-store
OBJECT_STORE: swift
SWIFT-AUTH: v2.0
- TESTS: object-store
OBJECT_STORE: swift
SWIFT-AUTH: v3
- TESTS: sqlite-php7.0-samba-native
- TESTS: sqlite-php7.0-samba-non-native
- TEST: memcache-memcached

3
tests/preseed-config.php
View file

@ -36,6 +36,7 @@ if (getenv('OBJECT_STORE') === 's3') {
}
if (getenv('OBJECT_STORE') === 'swift') {
$swiftHost = getenv('DRONE') === 'true' ? 'dockswift' : 'localhost';
$auth = getenv('SWIFT-AUTH') === '' ? '2.0' : getenv('SWIFT-AUTH');
$CONFIG['objectstore'] = [
'class' => 'OC\\Files\\ObjectStore\\Swift',
'arguments' => array(
@ -45,7 +46,7 @@ if (getenv('OBJECT_STORE') === 'swift') {
'password' => 'swift',
'serviceName' => 'swift',
'region' => 'regionOne',
'url' => "http://$swiftHost:5000/v2.0",
'url' => "http://$swiftHost:5000/$auth",
'bucket' => 'nextcloud'
)
];