Use minio for s3 tests

Signed-off-by: Julius Härtl <jus@bitgrid.net>

diff --git a/.drone.yml b/.drone.yml
index ce2de25b823d47128d1fe73671c1b168a1111e47..5a76da3d19e04d35702dbcf22809d72051c36a30 100644 (file)
--- a/.drone.yml
+++ b/.drone.yml
@@ -2148,6 +2148,15 @@ kind: pipeline
 name: object-store-s3
 
 steps:
+- name: minio
+  image: ghcr.io/nextcloud/continuous-integration-minio:latest
+  detach: true
+  commands:
+    - mkdir /s3data
+    - minio server /s3data
+  environment:
+    MINIO_ROOT_USER: nextcloud
+    MINIO_ROOT_PASSWORD: nextcloud
 - name: submodules
   image: docker:git
   commands:

diff --git a/tests/drone-wait-objectstore.sh b/tests/drone-wait-objectstore.sh
index 7914d45bed1dfa1192ac95acd852305a88fe7c81..7817d946682f93c01f324873ed6ec3041e479321 100755 (executable)
--- a/tests/drone-wait-objectstore.sh
+++ b/tests/drone-wait-objectstore.sh
@@ -12,6 +12,12 @@ function get_swift_token() {
     fi
 }
 
+if [ "$OBJECT_STORE" == "s3" ]; then
+       echo "Waiting for minio to be ready"
+       timeout 60 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' http://minio:9000)" != "403" ]]; do sleep 5; done' || (
+               echo "Failed to wait for minio to be ready" && exit 1
+       )
+fi
 if [ "$OBJECT_STORE" == "swift" ]; then
     echo "waiting for keystone"
     until get_swift_token

diff --git a/tests/preseed-config.php b/tests/preseed-config.php
index fdea46230c3b15d0feed8d548ae77d8c1faae888..c495d569bb5e754dc5fb55804c112ca51c2dcb55 100644 (file)
--- a/tests/preseed-config.php
+++ b/tests/preseed-config.php
@@ -25,10 +25,10 @@ if (getenv('OBJECT_STORE') === 's3') {
                'arguments' => [
                        'bucket' => 'nextcloud',
                        'autocreate' => true,
-                       'key' => 'dummy',
-                       'secret' => 'dummy',
-                       'hostname' => getenv('DRONE') === 'true' ? 'fake-s3' : 'localhost',
-                       'port' => 4569,
+                       'key' => 'nextcloud',
+                       'secret' => 'nextcloud',
+                       'hostname' => getenv('DRONE') === 'true' ? 'minio' : 'localhost',
+                       'port' => 9000,
                        'use_ssl' => false,
                        // required for some non amazon s3 implementations
                        'use_path_style' => true