diff options
| -rw-r--r-- | .drone.yml | 13 | ||||
| -rwxr-xr-x | tests/drone-wait-objectstore.sh | 6 | ||||
| -rw-r--r-- | tests/preseed-config.php | 8 |
3 files changed, 19 insertions, 8 deletions
diff --git a/.drone.yml b/.drone.yml index 8fcf944f12d..e5ef78f3d18 100644 --- a/.drone.yml +++ b/.drone.yml @@ -2117,6 +2117,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: ghcr.io/nextcloud/continuous-integration-alpine-git:latest commands: @@ -2134,10 +2143,6 @@ steps: - wget https://codecov.io/bash -O codecov.sh - bash codecov.sh -C $DRONE_COMMIT -f tests/autotest-clover-sqlite.xml -services: -- name: fake-s3 - image: ghcr.io/nextcloud/continuous-integration-fake-s3:latest - trigger: branch: - master diff --git a/tests/drone-wait-objectstore.sh b/tests/drone-wait-objectstore.sh index 7914d45bed1..7817d946682 100755 --- 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 97c8a1d11a8..16aea87c8a7 100644 --- 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 |