diff options
| author | Roeland Jago Douma <roeland@famdouma.nl> | 2018-02-21 14:48:10 +0100 |
|---|---|---|
| committer | Robin Appelman <robin@icewind.nl> | 2018-02-26 14:54:12 +0100 |
| commit | 4bcc282a4865085e9dfa3c6a844e53605d65aaea (patch) | |
| tree | 583f5ac5cb48724f635c2ea2fd3c3edbc9707bea | |
| parent | 31dd6d6aaea1bc6f5d710934fa890957080d279d (diff) | |
| download | nextcloud-server-4bcc282a4865085e9dfa3c6a844e53605d65aaea.tar.gz nextcloud-server-4bcc282a4865085e9dfa3c6a844e53605d65aaea.zip | |
Add v3.0 auth run
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| -rw-r--r-- | .drone.yml | 4 | ||||
| -rw-r--r-- | tests/preseed-config.php | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/.drone.yml b/.drone.yml index 9a0e7b25484..896d385ca33 100644 --- a/.drone.yml +++ b/.drone.yml @@ -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 diff --git a/tests/preseed-config.php b/tests/preseed-config.php index 5fbdc565417..c92c92b43b8 100644 --- a/tests/preseed-config.php +++ b/tests/preseed-config.php @@ -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' ) ]; |