From c5eb9c354ea241d6dda8aba2f2c8aed6cf045a17 Mon Sep 17 00:00:00 2001 From: Oren Cohen Date: Tue, 4 Jun 2024 10:39:35 +0300 Subject: [PATCH] Add flag to csv-merger to pass the test images NVRs (#2981) This is a manual backport of #2757 Signed-off-by: Oren Cohen --- tools/csv-merger/csv-merger.go | 6 +++++- tools/release-notes/go.mod | 4 ++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/tools/csv-merger/csv-merger.go b/tools/csv-merger/csv-merger.go index 55bebf54df..4bb1dd1980 100644 --- a/tools/csv-merger/csv-merger.go +++ b/tools/csv-merger/csv-merger.go @@ -122,6 +122,7 @@ var ( "Comma separated list of CSVs that can be skipped (read replaced) by this version") olmSkipRange = flag.String("olm-skip-range", "", "Semver range expression for CSVs that can be skipped (read replaced) by this version") + testImagesNVRs = flag.String("test-images-nvrs", "", "Test Images NVRs") envVars EnvVarFlags ) @@ -330,12 +331,15 @@ func getHcoCsv() { csvBase.Spec.DisplayName = *specDisplayName } + if *testImagesNVRs != "" { + csvBase.ObjectMeta.Annotations["test-images-nvrs"] = *testImagesNVRs + } + setSupported(csvBase) applyOverrides(csvBase) csvBase.Spec.RelatedImages = sortRelatedImages(csvBase.Spec.RelatedImages) - panicOnError(util.MarshallObject(csvBase, os.Stdout)) } diff --git a/tools/release-notes/go.mod b/tools/release-notes/go.mod index 4ad3f6f8f4..40754f1ed5 100644 --- a/tools/release-notes/go.mod +++ b/tools/release-notes/go.mod @@ -26,8 +26,8 @@ require ( github.com/mitchellh/go-homedir v1.1.0 // indirect github.com/sergi/go-diff v1.1.0 // indirect github.com/xanzy/ssh-agent v0.3.0 // indirect - golang.org/x/crypto v0.0.0-20211215165025-cf75a172585e // indirect - golang.org/x/net v0.6.0 // indirect + golang.org/x/crypto v0.1.0 // indirect + golang.org/x/net v0.7.0 // indirect golang.org/x/oauth2 v0.0.0-20220411215720-9780585627b5 // indirect golang.org/x/sys v0.5.0 // indirect google.golang.org/appengine v1.6.6 // indirect