Merge pull request #8509 from mfojtik/cancel-build

Merged by openshift-bot

Author: OpenShift Bot

contrib/completions/bash/oc

@@ -861,6 +861,7 @@ _oc_cancel-build()
 
     flags+=("--dump-logs")
     flags+=("--restart")
+    flags+=("--state=")
     flags+=("--api-version=")
     flags+=("--as=")
     flags+=("--certificate-authority=")

contrib/completions/bash/openshift

@@ -4446,6 +4446,7 @@ _openshift_cli_cancel-build()
 
     flags+=("--dump-logs")
     flags+=("--restart")
+    flags+=("--state=")
     flags+=("--api-version=")
     flags+=("--as=")
     flags+=("--certificate-authority=")

docs/generated/oc_by_example_content.adoc

@@ -627,20 +627,26 @@ Autoscale a deployment config or replication controller
 
 
 == oc cancel-build
-Cancel a pending or running build
+Cancel running, pending, or new builds
 
 ====
 
 [options="nowrap"]
 ----
   # Cancel the build with the given name
-  $ oc cancel-build 1da32cvq
+  $ oc cancel-build ruby-build-2
 
   # Cancel the named build and print the build logs
-  $ oc cancel-build 1da32cvq --dump-logs
+  $ oc cancel-build ruby-build-2 --dump-logs
 
   # Cancel the named build and create a new one with the same parameters
-  $ oc cancel-build 1da32cvq --restart
+  $ oc cancel-build ruby-build-2 --restart
+
+  # Cancel multiple builds
+  $ oc cancel-build ruby-build-1 ruby-build-2 ruby-build-3
+
+  # Cancel all builds created from 'ruby-build' build configuration that are in 'new' state
+  $ oc cancel-build bc/ruby-build --state=new
 ----
 ====
 

pkg/cmd/cli/cli.go

@@ -105,7 +105,7 @@ func NewCommandCLI(name, fullName string, in io.Reader, out, errout io.Writer) *
 				cmd.NewCmdRollback(fullName, f, out),
 				cmd.NewCmdNewBuild(fullName, f, in, out),
 				cmd.NewCmdStartBuild(fullName, f, in, out),
-				cmd.NewCmdCancelBuild(fullName, f, out),
+				cmd.NewCmdCancelBuild(fullName, f, in, out),
 				cmd.NewCmdImportImage(fullName, f, out),
 				cmd.NewCmdTag(fullName, f, out),
 			},