提交 f037b113 编写于 作者: K Kohsuke Kawaguchi

Added an option to wait for the start of a build.

上级 9e3b4951
......@@ -67,6 +67,8 @@ Upcoming changes</a>
<li class=rfe>
Reduce the total height of items shown in the view configuration page.
(<a href="https://github.com/jenkinsci/jenkins/pull/488">pull 488</a>)
<li class=rfe>
The CLI <tt>build</tt> command can now wait until the start of the build.
</ul>
</div><!--=TRUNK-END=-->
......
......@@ -30,19 +30,16 @@ import hudson.model.ParametersAction;
import hudson.model.ParameterValue;
import hudson.model.ParametersDefinitionProperty;
import hudson.model.ParameterDefinition;
import hudson.model.TaskListener;
import hudson.Extension;
import hudson.AbortException;
import hudson.model.Item;
import hudson.model.queue.QueueTaskFuture;
import hudson.scm.PollingResult.Change;
import hudson.util.EditDistance;
import hudson.scm.PollingResult;
import hudson.util.StreamTaskListener;
import org.kohsuke.args4j.Argument;
import org.kohsuke.args4j.Option;
import java.nio.charset.Charset;
import java.util.concurrent.Future;
import java.util.Map;
import java.util.HashMap;
import java.util.List;
......@@ -70,6 +67,9 @@ public class BuildCommand extends CLICommand {
@Option(name="-s",usage="Wait until the completion/abortion of the command")
public boolean sync = false;
@Option(name="-w",usage="Wait until the start of the command")
public boolean wait = false;
@Option(name="-c",usage="Check for SCM changes before starting the build, and if there's no change, exit without doing a build")
public boolean checkSCM = false;
......@@ -105,13 +105,22 @@ public class BuildCommand extends CLICommand {
}
}
Future<? extends AbstractBuild> f = job.scheduleBuild2(0, new CLICause(Jenkins.getAuthentication().getName()), a);
if (!sync) return 0;
QueueTaskFuture<? extends AbstractBuild> f = job.scheduleBuild2(0, new CLICause(Jenkins.getAuthentication().getName()), a);
if (wait) {
AbstractBuild b = f.waitForStart(); // wait for the start
stdout.println("Started "+b.getFullDisplayName()+" : "+b.getResult());
return 0;
}
if (sync) {
// TODO: should we abort the build if the CLI is cancelled?
AbstractBuild b = f.get(); // wait for the completion
stdout.println("Completed "+b.getFullDisplayName()+" : "+b.getResult());
return b.getResult().ordinal;
}
// TODO: should we abort the build if the CLI is cancelled?
AbstractBuild b = f.get(); // wait for the completion
stdout.println("Completed "+b.getFullDisplayName()+" : "+b.getResult());
return b.getResult().ordinal;
return 0;
}
@Override
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册