r.loginov/distribution
1
0
Fork 0
forked from TrueCloudLab/distribution
Code Pull requests Activity

Bump minio version and test less storage classes

Browse source 
This fixes some of the tests for minio.

The walk tests needs a version of minio that contains https://github.com/minio/minio/pull/18099

The storage classes minio supports are a subset of the s3 classes.

Signed-off-by: James Hewitt <james.hewitt@uk.ibm.com>
This commit is contained in:
James Hewitt 2023-10-17 02:10:43 +01:00
parent 1d410148ef
commit 647ec33c33
No known key found for this signature in database
GPG key ID: EA6C3C654B6193E4
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
registry/storage/driver/s3-aws/s3_test.go
View file

@ -210,7 +210,10 @@ func TestStorageClass(t *testing.T) {
rootDir := t.TempDir() rootDir := t.TempDir()
contents := []byte("contents") contents := []byte("contents")
ctx := context.Background() ctx := context.Background()
for _, storageClass := range s3StorageClasses {
// We don't need to test all the storage classes, just that its selectable.
// The first 3 are common to AWS and MinIO, so use those.
for _, storageClass := range s3StorageClasses[:3] {
filename := "/test-" + storageClass filename := "/test-" + storageClass
s3Driver, err := s3DriverConstructor(rootDir, storageClass) s3Driver, err := s3DriverConstructor(rootDir, storageClass)
if err != nil { if err != nil {

4
tests/docker-compose-storage.yml
View file

@ -1,6 +1,6 @@
services: services:
minio: minio:
image: docker.io/minio/minio:RELEASE.2023-09-20T22-49-55Z image: docker.io/minio/minio:RELEASE.2023-10-16T04-13-43Z
command: server /data --console-address ":9001" command: server /data --console-address ":9001"
healthcheck: healthcheck:
test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"] test: ["CMD", "curl", "-f", "http://localhost:9000/minio/health/live"]
@ -17,7 +17,7 @@ services:
- ./miniodata/distribution:/data:Z - ./miniodata/distribution:/data:Z
minio-init: minio-init:
image: docker.io/minio/mc:RELEASE.2023-02-16T19-20-11Z image: docker.io/minio/mc:RELEASE.2023-10-14T01-57-03Z
depends_on: depends_on:
minio: minio:
condition: service_healthy condition: service_healthy