Fix regex used to retrieve report (#12625)

* Strip timestamps before searching report string

* Move regex up, to match reprotRegex

* Fix parsing build report

* Add debug logs, cean up code

* Fix regex that search for builder report

cmd/image-builder/main.go

@@ -378,6 +378,7 @@ func buildInADO(o options) error {
 			fmt.Printf("ADO pipeline image build logs:\n%s", logs)
 		}
 
+		fmt.Println("Getting build report.")
 		// Parse the build report from the ADO pipeline run logs.
 		buildReport, err = imagebuilder.NewBuildReportFromLogs(logs)
 		if err != nil {

pkg/imagebuilder/report.go

@@ -9,7 +9,7 @@ import (
 
 // reportRegex is a regular expression that matches the image build report
 var (
-	reportRegex = regexp.MustCompile(`(?s)---IMAGE BUILD REPORT---\n(.*)\n---END OF IMAGE BUILD REPORT---`)
+	reportRegex = regexp.MustCompile(`(?s)---IMAGE BUILD REPORT---(.*)---END OF IMAGE BUILD REPORT---`)
 
 	timestampRegex = regexp.MustCompile(`\d{4}-\d{2}-\d{2}T\d{2}:\d{2}:\d{2}\.\d+Z\s`)
 )
@@ -50,7 +50,7 @@ func NewBuildReportFromLogs(log string) (*BuildReport, error) {
 	// Find the report in the log
 	matches := reportRegex.FindStringSubmatch(log)
 	if len(matches) < 2 {
-		return nil, fmt.Errorf("no image build report found in log")
+		return nil, fmt.Errorf("failed to find image build report in log")
 	}
 
 	// Parse the report data