diff --git a/bamboo-specs/src/main/java/buildjob/PlanSpec.java b/bamboo-specs/src/main/java/buildjob/PlanSpec.java index c4f4fd6..481810e 100644 --- a/bamboo-specs/src/main/java/buildjob/PlanSpec.java +++ b/bamboo-specs/src/main/java/buildjob/PlanSpec.java @@ -33,7 +33,7 @@ import com.atlassian.bamboo.specs.model.task.ScriptTaskProperties.Location; @BambooSpec public class PlanSpec { - private static final String SERVICE_NAME = "PyInfra"; + private static final String SERVICE_NAME = "pyinfra"; private static final String SERVICE_KEY = SERVICE_NAME.toUpperCase().replaceAll("-",""); @@ -71,7 +71,7 @@ public class PlanSpec { return new Plan( project(), SERVICE_NAME, new BambooKey(SERVICE_KEY)) - .description("Docker build for mini-queue-service-v1") + .description("Docker build for pyinfra") // .variables() .stages(new Stage("Build Stage") .jobs( @@ -94,7 +94,7 @@ public class PlanSpec { .description("Build Docker container.") .location(Location.FILE) .fileFromPath("bamboo-specs/src/main/resources/scripts/docker-build.sh") - .argument(SERVICE_NAME) + .argument(SERVICE_NAME)) .dockerConfiguration( new DockerConfiguration() .image("nexus.iqser.com:5001/infra/release_build:4.2.0") @@ -150,7 +150,7 @@ public class PlanSpec { .defaultRepository()) .dockerConfiguration( new DockerConfiguration() - .image("nexus.iqser.com:5001/infra/release_build:2.7.0")), + .image("nexus.iqser.com:5001/infra/release_build:4.4.1")), new Job("Licence Job", new BambooKey("LICENCE")) .enabled(false) .tasks( diff --git a/pyinfra/core.py b/pyinfra/core.py index 4056af8..63a83ae 100644 --- a/pyinfra/core.py +++ b/pyinfra/core.py @@ -29,7 +29,7 @@ def make_storage_data_loader(storage): try: return decompress(download(payload)) except Exception as err: - logging.warning(f"Loading data from storage failed for {payload}") + logging.warning(f"Loading data from storage failed for {payload}.") raise DataLoadingFailure() from err return load_data @@ -38,9 +38,11 @@ def make_storage_data_loader(storage): def make_analyzer(analysis_endpoint): def analyze(data): try: + logging.debug(f"Requesting analysis from {analysis_endpoint}...") analysis_response = requests.post(analysis_endpoint, data=data) analysis_response.raise_for_status() analysis_response = analysis_response.json() + logging.debug(f"Received response.") return analysis_response except Exception as err: logging.warning("Exception caught when calling analysis endpoint.") @@ -50,7 +52,6 @@ def make_analyzer(analysis_endpoint): def make_payload_processor(load_data, analyze_file): - @json_wrap def process(payload: dict): logging.info(f"Processing {payload}...")