Add v3.0 auth run
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
parent
31dd6d6aae
commit
4bcc282a48
|
@ -755,6 +755,10 @@ matrix:
|
||||||
OBJECT_STORE: s3
|
OBJECT_STORE: s3
|
||||||
- TESTS: object-store
|
- TESTS: object-store
|
||||||
OBJECT_STORE: swift
|
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-native
|
||||||
- TESTS: sqlite-php7.0-samba-non-native
|
- TESTS: sqlite-php7.0-samba-non-native
|
||||||
- TEST: memcache-memcached
|
- TEST: memcache-memcached
|
||||||
|
|
|
@ -36,6 +36,7 @@ if (getenv('OBJECT_STORE') === 's3') {
|
||||||
}
|
}
|
||||||
if (getenv('OBJECT_STORE') === 'swift') {
|
if (getenv('OBJECT_STORE') === 'swift') {
|
||||||
$swiftHost = getenv('DRONE') === 'true' ? 'dockswift' : 'localhost';
|
$swiftHost = getenv('DRONE') === 'true' ? 'dockswift' : 'localhost';
|
||||||
|
$auth = getenv('SWIFT-AUTH') === '' ? '2.0' : getenv('SWIFT-AUTH');
|
||||||
$CONFIG['objectstore'] = [
|
$CONFIG['objectstore'] = [
|
||||||
'class' => 'OC\\Files\\ObjectStore\\Swift',
|
'class' => 'OC\\Files\\ObjectStore\\Swift',
|
||||||
'arguments' => array(
|
'arguments' => array(
|
||||||
|
@ -45,7 +46,7 @@ if (getenv('OBJECT_STORE') === 'swift') {
|
||||||
'password' => 'swift',
|
'password' => 'swift',
|
||||||
'serviceName' => 'swift',
|
'serviceName' => 'swift',
|
||||||
'region' => 'regionOne',
|
'region' => 'regionOne',
|
||||||
'url' => "http://$swiftHost:5000/v2.0",
|
'url' => "http://$swiftHost:5000/$auth",
|
||||||
'bucket' => 'nextcloud'
|
'bucket' => 'nextcloud'
|
||||||
)
|
)
|
||||||
];
|
];
|
||||||
|
|
Loading…
Reference in New Issue