diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 41d14a21464b37798b159a8525a5416360eb7647..e64e6d596d4991e9cb494ec63ea7c06e3b47ebe8 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -19,6 +19,8 @@ stages: sonarqube: stage: sonar-analysis + tags: + - build before_script: - export PATH=$PATH:/usr/local/bin/sonar-scanner-3.2.0.1227-linux/bin/ - export NODE_PATH=$NODE_PATH:`npm root -g` @@ -36,6 +38,8 @@ sonarqube: build_development: stage: build + tags: + - build script: - export TAG=dev - docker-compose build @@ -46,6 +50,8 @@ build_release: stage: build only: - tags + tags: + - build script: - export TAG=$(echo $CI_COMMIT_TAG | sed 's/v//g') - docker-compose build diff --git a/main.py b/main.py index a7c916b1c6ae8357dade6e7c4fa3db8e267cddc7..35fd3b73aa16ea4c3e7558453f5b4d8ab14b5cb7 100644 --- a/main.py +++ b/main.py @@ -10,7 +10,7 @@ logging.basicConfig(format="%(asctime)s [%(levelname)s] [%(name)s] %(message)s", logger = logging.getLogger(__name__) from minio import Minio -from minio.error import ResponseError, NoSuchBucket +from minio.error import InvalidResponseError, NoSuchBucket def mirror(src, dst, bucket, tmp_directory): @@ -62,7 +62,7 @@ def mirror(src, dst, bucket, tmp_directory): with open(tmp_file, 'wb') as file_data: for d in data.stream(32*1024): file_data.write(d) - except ResponseError as err: + except InvalidResponseError as err: logger.error(err) try: @@ -72,7 +72,7 @@ def mirror(src, dst, bucket, tmp_directory): logger.debug("MIME type: {0}".format(mime_type)) dst.put_object(bucket, object_name, file_data, file_stat.st_size, content_type=mime_type) - except ResponseError as err: + except InvalidResponseError as err: logger.error(err) else: logger.debug('No object to copy.') @@ -83,7 +83,7 @@ def mirror(src, dst, bucket, tmp_directory): try: for del_err in dst.remove_objects(bucket, object_names_to_rm): logger.error("Deletion Error: {}".format(del_err)) - except ResponseError as err: + except InvalidResponseError as err: logger.error(err) else: logger.debug('No object to remove.')