From be371b48476613c7c29d4eaae0be203064966c9c Mon Sep 17 00:00:00 2001 From: Sascha Grunert Date: Mon, 1 Jul 2024 12:55:18 +0200 Subject: [PATCH] Use new release-sdk `WaitResults` API Signed-off-by: Sascha Grunert --- go.mod | 2 +- go.sum | 4 ++-- pkg/obs/stage.go | 5 ++--- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 8950fd10dd7..fd3866b11ec 100644 --- a/go.mod +++ b/go.mod @@ -43,7 +43,7 @@ require ( sigs.k8s.io/bom v0.6.0 sigs.k8s.io/mdtoc v1.3.0 sigs.k8s.io/promo-tools/v3 v3.6.0 - sigs.k8s.io/release-sdk v0.12.0 + sigs.k8s.io/release-sdk v0.12.1 sigs.k8s.io/release-utils v0.8.3-0.20240529125243-e30fa4b6f720 sigs.k8s.io/yaml v1.4.0 ) diff --git a/go.sum b/go.sum index fea63851f36..4775f7ddc19 100644 --- a/go.sum +++ b/go.sum @@ -1313,8 +1313,8 @@ sigs.k8s.io/mdtoc v1.3.0 h1:iMJLfMax45vMl3rnwLjEhZ38TS6JqLXSpm0uDNo/zyo= sigs.k8s.io/mdtoc v1.3.0/go.mod h1:8zLWymqzP8oKMm+1m1e5GKnGZq8gbC1MreKfmRelMQA= sigs.k8s.io/promo-tools/v3 v3.6.0 h1:C2L08ezrWm1aZI8Emd3iZPZQserLPRgzuqQVxvI0PUI= sigs.k8s.io/promo-tools/v3 v3.6.0/go.mod h1:XJ3jy0hJYs+hWKt8XsLHFzGQV8PUtvllvbxjN/E5RXI= -sigs.k8s.io/release-sdk v0.12.0 h1:8rQ/eiXsp2EhRWTdgoCM+JQHplzCqtSZ5ksUJsbSU70= -sigs.k8s.io/release-sdk v0.12.0/go.mod h1:kT7repBLFONEhQxgKa1Ddm4Wy/0oRrQWGIwj4hocyrs= +sigs.k8s.io/release-sdk v0.12.1 h1:/Q+yWpl33EnFx1b7xh6FnbioWSRUTrVkigL4KZVTrkU= +sigs.k8s.io/release-sdk v0.12.1/go.mod h1:nnB4tt1g0VXMUCIYzDzPVqNI896OQrWipE6WbyZ6FSk= sigs.k8s.io/release-utils v0.8.3-0.20240529125243-e30fa4b6f720 h1:WsA6SydwiSu0sbYwgXpH72xWnxNAhSrcYd3W0LySZLs= sigs.k8s.io/release-utils v0.8.3-0.20240529125243-e30fa4b6f720/go.mod h1:u2Si4cUBWo2KBAL+7WB8d/HtwgqgssDAHepYu5+dpQY= sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4= diff --git a/pkg/obs/stage.go b/pkg/obs/stage.go index 744aa13ce42..c9ffe015852 100644 --- a/pkg/obs/stage.go +++ b/pkg/obs/stage.go @@ -29,7 +29,6 @@ import ( "k8s.io/release/pkg/obs/specs" "k8s.io/release/pkg/release" "sigs.k8s.io/release-sdk/osc" - "sigs.k8s.io/release-utils/command" "sigs.k8s.io/release-utils/util" ) @@ -219,9 +218,9 @@ func (d *defaultStageImpl) CommitChanges(workspaceDir, project, packageName, mes return osc.OSC(filepath.Join(workspaceDir, obsRoot, project, packageName), "commit", "-m", message) } -// Wait runs `osc results -w` for the package. +// Wait runs `osc results -w -F` for the package. func (d *defaultStageImpl) Wait(project, packageName string) error { - return command.New(osc.OSCExecutable, "results", fmt.Sprintf("%s/%s", project, packageName), "-w").RunSuccess() + return osc.WaitResults(project, packageName) } func (d *DefaultStage) Submit(stream bool) error {