Add v3.0 auth run

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
nextcloud · Feb 21, 2018 · fa8a762 · fa8a762
1 parent 7801312
commit fa8a762
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/.drone.yml b/.drone.yml
@@ -755,6 +755,10 @@ matrix:
       OBJECT_STORE: s3
     - TESTS: object-store
       OBJECT_STORE: swift
+      SWIFT-AUTH: 2.0
+    - TESTS: object-store
+      OBJECT_STORE: swift
+      SWIFT-AUTH: 3.0
     - 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
@@ -36,6 +36,7 @@
 }
 if (getenv('OBJECT_STORE') === 'swift') {
 	$swiftHost = getenv('DRONE') === 'true' ? 'dockswift' : 'localhost';
+	$auth = getenv('SWIFT-AUTH') === '2.0' ? 'v2.0' : 'v3.0';
 	$CONFIG['objectstore'] = [
 		'class' => 'OC\\Files\\ObjectStore\\Swift',
 		'arguments' => array(
@@ -45,7 +46,7 @@
 			'password' => 'swift',
 			'serviceName' => 'swift',
 			'region' => 'regionOne',
-			'url' => "http://$swiftHost:5000/v2.0",
+			'url' => "http://$swiftHost:5000/$auth",
 			'bucket' => 'nextcloud'
 		)
 	];