From 4bcc282a4865085e9dfa3c6a844e53605d65aaea Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Wed, 21 Feb 2018 14:48:10 +0100
Subject: [PATCH] Add v3.0 auth run

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
---
 .drone.yml               | 4 ++++
 tests/preseed-config.php | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/.drone.yml b/.drone.yml
index 9a0e7b2548..896d385ca3 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 5fbdc56541..c92c92b43b 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'
 		)
 	];