From eccbf4d9bc9b6ea0c6804d4720ed6025a55cbbb0 Mon Sep 17 00:00:00 2001 From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com> Date: Mon, 25 Nov 2024 15:38:22 +0000 Subject: [PATCH] fix(gceBakeHandler): Updating Image name pattern to match googlecompute pre/post 1.1.2 plugin (#1122) (#1123) (cherry picked from commit 0ff5ffe87d13e72257ed1b79dcaaa726022baab1) Co-authored-by: Christos Arvanitis --- .../rosco/providers/google/GCEBakeHandler.groovy | 2 +- .../providers/google/GCEBakeHandlerSpec.groovy | 13 +++++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/google/GCEBakeHandler.groovy b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/google/GCEBakeHandler.groovy index ae5990ce6..1ec2949cd 100644 --- a/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/google/GCEBakeHandler.groovy +++ b/rosco-core/src/main/groovy/com/netflix/spinnaker/rosco/providers/google/GCEBakeHandler.groovy @@ -35,7 +35,7 @@ import java.util.concurrent.atomic.AtomicReference @Component public class GCEBakeHandler extends CloudProviderBakeHandler { - private static final String IMAGE_NAME_TOKEN = "googlecompute: A disk image was created:" + private static final String IMAGE_NAME_TOKEN = "googlecompute: A disk image was created" private final resolvedBakeryDefaults = new AtomicReference() diff --git a/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/google/GCEBakeHandlerSpec.groovy b/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/google/GCEBakeHandlerSpec.groovy index 0e5b67935..9cf9cf30e 100644 --- a/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/google/GCEBakeHandlerSpec.groovy +++ b/rosco-core/src/test/groovy/com/netflix/spinnaker/rosco/providers/google/GCEBakeHandlerSpec.groovy @@ -164,16 +164,21 @@ class GCEBakeHandlerSpec extends Specification implements TestDefaults{ "Build 'googlecompute' finished.\n" + "\n" + "==> Builds finished. The artifacts of successful builds are:\n" + - "--> googlecompute: A disk image was created: kato-x12345678-trusty" + "--> googlecompute: ${packerLog}" - Bake bake = gceBakeHandler.scrapeCompletedBakeResults(REGION, "123", logsContent) + Bake bake = gceBakeHandler.scrapeCompletedBakeResults(REGION, bakeId, logsContent) then: with (bake) { - id == "123" + id == bakeId !ami - image_name == "kato-x12345678-trusty" + image_name == imageName } + + where: + packerLog | bakeId | imageName + "A disk image was created: kato-x12345678-trusty" | "123" | "kato-x12345678-trusty" + "A disk image was created in the test-gcp project: kato-x12345678-trusty-changed" | "456" | "kato-x12345678-trusty-changed" } void 'scraping returns null for missing image name'() {