From 0e47ba61c76696b4e2471a9929f9b4c240234dda Mon Sep 17 00:00:00 2001 From: Matthias Bisping Date: Thu, 28 Apr 2022 16:29:15 +0200 Subject: [PATCH] Pull request #34: Aws region Merge in RR/pyinfra from aws_region to master Squashed commit of the following: commit 7d5513e8b2e46218fe6f030abf99cc05b3fed7f5 Author: Matthias Bisping Date: Thu Apr 28 16:08:20 2022 +0200 changed test bucket commit caba7b503edbc6147aa69f8044ac92a81e768abd Merge: e76f0ab 52acc30 Author: Matthias Bisping Date: Thu Apr 28 15:30:57 2022 +0200 Merge branch 'master' of ssh://git.iqser.com:2222/rr/pyinfra into aws_region commit e76f0ab1f29b774d9297453c82b3b5749ea4cb44 Author: Matthias Bisping Date: Thu Apr 28 15:30:19 2022 +0200 changed test bucket commit 29b15be9337fb409f6a0bfbb29026baa4bbe7236 Author: Matthias Bisping Date: Thu Apr 28 15:08:43 2022 +0200 added aws region to config --- config.yaml | 2 +- test/unit_tests/conftest.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.yaml b/config.yaml index 079b09a..a7f8efe 100755 --- a/config.yaml +++ b/config.yaml @@ -23,7 +23,7 @@ rabbitmq: storage: backend: $STORAGE_BACKEND|s3 # The type of storage to use {s3, azure} - bucket: "STORAGE_BUCKET_NAME|STORAGE_AZURECONTAINERNAME|pyinfra-test-bucket2" # The bucket / container to pull files specified in queue requests from + bucket: "STORAGE_BUCKET_NAME|STORAGE_AZURECONTAINERNAME|pyinfra-test-bucket" # The bucket / container to pull files specified in queue requests from s3: endpoint: $STORAGE_ENDPOINT|"http://127.0.0.1:9000" diff --git a/test/unit_tests/conftest.py b/test/unit_tests/conftest.py index c614ee0..92d78cf 100644 --- a/test/unit_tests/conftest.py +++ b/test/unit_tests/conftest.py @@ -28,7 +28,7 @@ logger.setLevel(logging.DEBUG) @pytest.fixture(scope="session") def bucket_name(): - return "pyinfra-test-bucket2" + return "pyinfra-test-bucket" @pytest.fixture