increase timeout to cancel pipeline builds, augment cancel-build status

https://bugzilla.redhat.com/show_bug.cgi?id=1608745
anurags9810 · Jul 27, 2018 · a3b1adc · a3b1adc
1 parent 0c4c2ad
commit a3b1adc
Show file tree

Hide file tree

Showing 2 changed files with 48 additions and 31 deletions.
diff --git a/pkg/oc/cli/cancelbuild/cancelbuild.go b/pkg/oc/cli/cancelbuild/cancelbuild.go
@@ -63,14 +63,15 @@ type CancelBuildOptions struct {
 	Namespace  string
 	BuildNames []string
 
-	HasError       bool
-	ReportError    func(error)
-	PrinterCancel  printers.ResourcePrinter
-	PrinterRestart printers.ResourcePrinter
-	Mapper         meta.RESTMapper
-	Client         buildinternalclient.Interface
-	BuildClient    buildtypedclient.BuildResourceInterface
-	BuildLister    buildlister.BuildLister
+	HasError                bool
+	ReportError             func(error)
+	PrinterCancel           printers.ResourcePrinter
+	PrinterCancelInProgress printers.ResourcePrinter
+	PrinterRestart          printers.ResourcePrinter
+	Mapper                  meta.RESTMapper
+	Client                  buildinternalclient.Interface
+	BuildClient             buildtypedclient.BuildResourceInterface
+	BuildLister             buildlister.BuildLister
 
 	// timeout is used by unit tests to shorten the polling period
 	timeout time.Duration
@@ -122,6 +123,7 @@ func (o *CancelBuildOptions) Complete(f kcmdutil.Factory, cmd *cobra.Command, ar
 	// FIXME: this double printers should not be necessary
 	o.PrinterCancel = &printers.NamePrinter{Operation: "cancelled"}
 	o.PrinterRestart = &printers.NamePrinter{Operation: "restarted"}
+	o.PrinterCancelInProgress = &printers.NamePrinter{Operation: "marked for cancellation, waiting to be cancelled"}
 
 	if o.timeout.Seconds() == 0 {
 		o.timeout = 30 * time.Second
@@ -245,8 +247,18 @@ func (o *CancelBuildOptions) RunCancelBuild() error {
 				return
 			}
 
+			// ignore exit if error here; the phase verfication below is more important
+			o.PrinterCancelInProgress.PrintObj(kcmdutil.AsDefaultVersionedOrOriginal(build, nil), o.Out)
+
 			// Make sure the build phase is really cancelled.
-			err = wait.Poll(500*time.Millisecond, o.timeout, func() (bool, error) {
+			timeout := o.timeout
+			if build.Spec.Strategy.JenkinsPipelineStrategy != nil {
+				//bump the timeout in case we have to wait for Jenkins
+				//to come up so that the sync plugin can actually change
+				//the phase
+				timeout = timeout + (3 * time.Minute)
+			}
+			err = wait.Poll(500*time.Millisecond, timeout, func() (bool, error) {
 				updatedBuild, err := o.BuildClient.Get(build.Name, metav1.GetOptions{})
 				if err != nil {
 					return true, err

diff --git a/pkg/oc/cli/cancelbuild/cancelbuild_test.go b/pkg/oc/cli/cancelbuild/cancelbuild_test.go
@@ -64,11 +64,12 @@ func TestCancelBuildRun(t *testing.T) {
 	}{
 		"cancelled": {
 			opts: &CancelBuildOptions{
-				PrinterCancel:  &discardingPrinter{},
-				PrinterRestart: &discardingPrinter{},
-				IOStreams:      genericclioptions.NewTestIOStreamsDiscard(),
-				Namespace:      "test",
-				States:         []string{"new", "pending", "running"},
+				PrinterCancel:           &discardingPrinter{},
+				PrinterCancelInProgress: &discardingPrinter{},
+				PrinterRestart:          &discardingPrinter{},
+				IOStreams:               genericclioptions.NewTestIOStreamsDiscard(),
+				Namespace:               "test",
+				States:                  []string{"new", "pending", "running"},
 			},
 			phase: buildapi.BuildPhaseCancelled,
 			expectedActions: []testAction{
@@ -78,10 +79,11 @@ func TestCancelBuildRun(t *testing.T) {
 		},
 		"complete": {
 			opts: &CancelBuildOptions{
-				PrinterCancel:  &discardingPrinter{},
-				PrinterRestart: &discardingPrinter{},
-				IOStreams:      genericclioptions.NewTestIOStreamsDiscard(),
-				Namespace:      "test",
+				PrinterCancel:           &discardingPrinter{},
+				PrinterCancelInProgress: &discardingPrinter{},
+				PrinterRestart:          &discardingPrinter{},
+				IOStreams:               genericclioptions.NewTestIOStreamsDiscard(),
+				Namespace:               "test",
 			},
 			phase: buildapi.BuildPhaseComplete,
 			expectedActions: []testAction{
@@ -91,10 +93,11 @@ func TestCancelBuildRun(t *testing.T) {
 		},
 		"new": {
 			opts: &CancelBuildOptions{
-				PrinterCancel:  &discardingPrinter{},
-				PrinterRestart: &discardingPrinter{},
-				IOStreams:      genericclioptions.NewTestIOStreamsDiscard(),
-				Namespace:      "test",
+				PrinterCancel:           &discardingPrinter{},
+				PrinterCancelInProgress: &discardingPrinter{},
+				PrinterRestart:          &discardingPrinter{},
+				IOStreams:               genericclioptions.NewTestIOStreamsDiscard(),
+				Namespace:               "test",
 			},
 			phase: buildapi.BuildPhaseNew,
 			expectedActions: []testAction{
@@ -106,10 +109,11 @@ func TestCancelBuildRun(t *testing.T) {
 		},
 		"pending": {
 			opts: &CancelBuildOptions{
-				PrinterCancel:  &discardingPrinter{},
-				PrinterRestart: &discardingPrinter{},
-				IOStreams:      genericclioptions.NewTestIOStreamsDiscard(),
-				Namespace:      "test",
+				PrinterCancel:           &discardingPrinter{},
+				PrinterCancelInProgress: &discardingPrinter{},
+				PrinterRestart:          &discardingPrinter{},
+				IOStreams:               genericclioptions.NewTestIOStreamsDiscard(),
+				Namespace:               "test",
 			},
 			phase: buildapi.BuildPhaseNew,
 			expectedActions: []testAction{
@@ -121,11 +125,12 @@ func TestCancelBuildRun(t *testing.T) {
 		},
 		"running and restart": {
 			opts: &CancelBuildOptions{
-				PrinterCancel:  &discardingPrinter{},
-				PrinterRestart: &discardingPrinter{},
-				IOStreams:      genericclioptions.NewTestIOStreamsDiscard(),
-				Namespace:      "test",
-				Restart:        true,
+				PrinterCancel:           &discardingPrinter{},
+				PrinterCancelInProgress: &discardingPrinter{},
+				PrinterRestart:          &discardingPrinter{},
+				IOStreams:               genericclioptions.NewTestIOStreamsDiscard(),
+				Namespace:               "test",
+				Restart:                 true,
 			},
 			phase: buildapi.BuildPhaseNew,
 			expectedActions: []testAction{