Merge pull request #3662 from saschagrunert/stage-wait

k8s-ci-robot · web-flow · commit 838696c1b030 · 2024-07-01T04:13:09.000-07:00
Use new release-sdk `WaitResults` API
diff --git 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
@@ -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
@@ -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 {

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ require (`
`43`	`43`	`sigs.k8s.io/bom v0.6.0`
`44`	`44`	`sigs.k8s.io/mdtoc v1.3.0`
`45`	`45`	`sigs.k8s.io/promo-tools/v3 v3.6.0`
`46`		`- sigs.k8s.io/release-sdk v0.12.0`
	`46`	`+ sigs.k8s.io/release-sdk v0.12.1`
`47`	`47`	`sigs.k8s.io/release-utils v0.8.3-0.20240529125243-e30fa4b6f720`
`48`	`48`	`sigs.k8s.io/yaml v1.4.0`
`49`	`49`	`)`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,6 @@ import (`
`29`	`29`	`"k8s.io/release/pkg/obs/specs"`
`30`	`30`	`"k8s.io/release/pkg/release"`
`31`	`31`	`"sigs.k8s.io/release-sdk/osc"`
`32`		`- "sigs.k8s.io/release-utils/command"`
`33`	`32`	`"sigs.k8s.io/release-utils/util"`
`34`	`33`	`)`
`35`	`34`
`@@ -219,9 +218,9 @@ func (d *defaultStageImpl) CommitChanges(workspaceDir, project, packageName, mes`
`219`	`218`	`return osc.OSC(filepath.Join(workspaceDir, obsRoot, project, packageName), "commit", "-m", message)`
`220`	`219`	`}`
`221`	`220`
`222`		-// Wait runs `osc results -w` for the package.
	`221`	+// Wait runs `osc results -w -F` for the package.
`223`	`222`	`func (d *defaultStageImpl) Wait(project, packageName string) error {`
`224`		`- return command.New(osc.OSCExecutable, "results", fmt.Sprintf("%s/%s", project, packageName), "-w").RunSuccess()`
	`223`	`+ return osc.WaitResults(project, packageName)`
`225`	`224`	`}`
`226`	`225`
`227`	`226`	`func (d *DefaultStage) Submit(stream bool) error {`