From df6e23c98ce3d5a50c417a085f2095f42b663efa Mon Sep 17 00:00:00 2001
From: Robin Appelman <robin@icewind.nl>
Date: Wed, 7 Feb 2018 17:16:54 +0100
Subject: add ci for swift primary storage

Signed-off-by: Robin Appelman <robin@icewind.nl>
---
 tests/drone-wait-objectstore.sh           | 10 ++++++++++
 tests/lib/Files/ObjectStore/SwiftTest.php |  3 +++
 tests/preseed-config.php                  | 16 ++++++++++++++++
 3 files changed, 29 insertions(+)
 create mode 100755 tests/drone-wait-objectstore.sh

(limited to 'tests')

diff --git a/tests/drone-wait-objectstore.sh b/tests/drone-wait-objectstore.sh
new file mode 100755
index 00000000000..1e5a13ee55e
--- /dev/null
+++ b/tests/drone-wait-objectstore.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ "$OBJECT_STORE" == "swift" ]; then
+    echo "waiting for swift"
+    until curl -I http://dockswift:5000/v3
+    do
+        sleep 2
+    done
+    sleep 30
+fi
diff --git a/tests/lib/Files/ObjectStore/SwiftTest.php b/tests/lib/Files/ObjectStore/SwiftTest.php
index f2aeace769c..1ea55a84628 100644
--- a/tests/lib/Files/ObjectStore/SwiftTest.php
+++ b/tests/lib/Files/ObjectStore/SwiftTest.php
@@ -23,6 +23,9 @@ namespace Test\Files\ObjectStore;
 
 use OC\Files\ObjectStore\Swift;
 
+/**
+ * @group PRIMARY-swift
+ */
 class SwiftTest extends ObjectStoreTest {
 	/**
 	 * @return \OCP\Files\ObjectStore\IObjectStore
diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index 7c080038734..5fbdc565417 100644
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -34,3 +34,19 @@ if (getenv('OBJECT_STORE') === 's3') {
 		)
 	];
 }
+if (getenv('OBJECT_STORE') === 'swift') {
+	$swiftHost = getenv('DRONE') === 'true' ? 'dockswift' : 'localhost';
+	$CONFIG['objectstore'] = [
+		'class' => 'OC\\Files\\ObjectStore\\Swift',
+		'arguments' => array(
+			'autocreate' => true,
+			'username' => 'swift',
+			'tenantName' => 'service',
+			'password' => 'swift',
+			'serviceName' => 'swift',
+			'region' => 'regionOne',
+			'url' => "http://$swiftHost:5000/v2.0",
+			'bucket' => 'nextcloud'
+		)
+	];
+}
-- 
cgit v1.2.3