mirror of https://github.com/nextcloud/server
Use minio for s3 tests
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
parent
3f44fd00e2
commit
55cabef723
13
.drone.yml
13
.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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue