mirror of
https://github.com/distribution/distribution.git
synced 2025-09-17 23:59:57 +00:00
Rename cloud make targets to s3
Originally we used to have integration tests only for S3 so we decided to call them "clooud" (tests). We've now added integration tests for Azure storage driver so calling the S3 one cloud is just opaque and rather confusing. This commit renamed -cloud- targets to -s3- ones. Signed-off-by: Milos Gajdos <milosthegajdos@gmail.com>
This commit is contained in:
2
.github/workflows/build.yml
vendored
2
.github/workflows/build.yml
vendored
@@ -37,7 +37,7 @@ jobs:
|
||||
- 1.23.6
|
||||
target:
|
||||
- test-coverage
|
||||
- test-cloud-storage # TODO: rename to test-s3-storage
|
||||
- test-s3-storage
|
||||
- test-azure-storage
|
||||
steps:
|
||||
-
|
||||
|
@@ -110,7 +110,7 @@ You must have a [docker compose](https://docs.docker.com/compose/) compatible to
|
||||
|
||||
Start the local cloud environment:
|
||||
```
|
||||
make start-cloud-storage
|
||||
make start-s3-storage
|
||||
```
|
||||
There is a sample registry configuration file that lets you point the registry to the started storage:
|
||||
```
|
||||
@@ -125,5 +125,5 @@ AWS_ACCESS_KEY=distribution \
|
||||
```
|
||||
Stop the local storage when done:
|
||||
```
|
||||
make stop-cloud-storage
|
||||
make stop-s3-storage
|
||||
```
|
||||
|
18
Makefile
18
Makefile
@@ -122,26 +122,26 @@ test-coverage: ## run unit tests and generate test coverprofiles
|
||||
fi; \
|
||||
done )
|
||||
|
||||
.PHONY: test-cloud-storage
|
||||
test-cloud-storage: start-cloud-storage run-s3-tests stop-cloud-storage ## run cloud storage driver tests
|
||||
.PHONY: test-s3-storage
|
||||
test-s3-storage: start-s3-storage run-s3-tests stop-s3-storage ## run s3 storage driver tests
|
||||
|
||||
.PHONY: start-cloud-storage
|
||||
start-cloud-storage: ## start local cloud storage (minio)
|
||||
.PHONY: start-s3-storage
|
||||
start-s3-storage: ## start local s3 storage (minio)
|
||||
$(COMPOSE) -f tests/docker-compose-storage.yml up minio minio-init -d
|
||||
|
||||
.PHONY: stop-cloud-storage
|
||||
stop-cloud-storage: ## stop local cloud storage (minio)
|
||||
.PHONY: stop-s3-storage
|
||||
stop-s3-storage: ## stop local s3 storage (minio)
|
||||
$(COMPOSE) -f tests/docker-compose-storage.yml down
|
||||
|
||||
.PHONY: reset-cloud-storage
|
||||
reset-cloud-storage: ## reset (stop, delete, start) local cloud storage (minio)
|
||||
.PHONY: reset-s3-storage
|
||||
reset-s3-storage: ## reset (stop, delete, start) local cloud storage (minio)
|
||||
$(COMPOSE) -f tests/docker-compose-storage.yml down
|
||||
@mkdir -p tests/miniodata/distribution
|
||||
@rm -rf tests/miniodata/distribution/* tests/miniodata/.minio.sys
|
||||
$(COMPOSE) -f tests/docker-compose-storage.yml up minio minio-init -d
|
||||
|
||||
.PHONY: run-s3-tests
|
||||
run-s3-tests: start-cloud-storage ## run S3 storage driver integration tests
|
||||
run-s3-tests: start-s3-storage ## run S3 storage driver integration tests
|
||||
AWS_ACCESS_KEY=distribution \
|
||||
AWS_SECRET_KEY=password \
|
||||
AWS_REGION=us-east-1 \
|
||||
|
Reference in New Issue
Block a user