All new accounts created on Gitlab now require administrator approval. If you invite any collaborators, please let Flux staff know so they can approve the accounts.

Commit 857d5f3d authored by Leigh B Stoller's avatar Leigh B Stoller

Quickie ignore failures checkbox for admins only. The formatting on the

instantiate page is completely messed up, so no plan to release to general
public until Keith can look at it.
parent e6675429
......@@ -43,9 +43,10 @@ sub usage()
print "Usage: quickvm [-u uuid] [--site site:1=aggregate ...] <xmlfile>\n";
exit(1);
}
my @optlist = ('d', 'v', 'u=s', 'a=s', 'S', 'k=s');
my @optlist = ('d', 'v', 'u=s', 'a=s', 'S', 'k=s', 'i');
my $debug = 0;
my $verbose = 1;
my $ignorefailures = 0;
my $xmlfile;
my $webtask;
my $webtask_id;
......@@ -148,6 +149,9 @@ if (defined($options{"k"})) {
if (defined($options{"d"})) {
$debug = 1;
}
if (defined($options{"i"})) {
$ignorefailures = 1;
}
if (defined($options{"v"})) {
$verbose = 1;
}
......@@ -932,7 +936,12 @@ foreach my $aggobj (@aggregate_list) {
$slice->UnLock();
if ($failed) {
$instance->SetStatus("failed");
if ($ignorefailures) {
$instance->SetStatus("ready");
}
else {
$instance->SetStatus("failed");
}
# Webtask exit status set above.
$instance->RecordError($webtask->exitcode(),
(defined($webtask->output()) ?
......
<?php
#
# Copyright (c) 2000-2015 University of Utah and the Flux Group.
# Copyright (c) 2000-2016 University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
......@@ -750,6 +750,10 @@ function Do_Submit()
chmod($keyname, 0666);
$options .= " -k $keyname";
}
if (isset($formfields["failure_okay"]) &&
$formfields["failure_okay"] == "checked" && ISADMIN()) {
$options .= " -i ";
}
#
# Invoke the backend.
......
......@@ -125,7 +125,7 @@ function (_, Constraints, sup, ppstart, JacksEditor, wt,
showpicker: showpicker,
cancopy: window.CANCOPY,
clustername: window.PORTAL_NAME,
admin: isadmin,
});
$('#main-body').html(html);
......
......@@ -337,6 +337,25 @@
<div id='cluster_selector' class='hidden'></div>
</div>
<% } %>
<% if (admin) { %>
<div class='form-horizontal experiment_option'>
<div class='form-group format-me'>
<div class="row">
<label class='col-sm-4 control-label'
style='text-align: right;'>Ignore Failures:</label>
<div class='col-sm-2'>
<input id='failure_okay' type="checkbox" value="checked"
class=''
data-key='failure_okay'
name='failure_okay'
<%= formfields.failure_okay %>>
</div>
</div>
<label class='control-label control-error hidden'
for='failure_okay'></label>
</div>
</div>
<% } %>
</div>
<div id="cluster_status_link"><center>
<a target="_blank" href="cluster-graphs.php">
......@@ -527,4 +546,4 @@
<div id='ppviewmodal_div'></div>
<div id='ppmodal_div'></div>
<div id='instantiate_div'></div>
<div id='editmodal_div'></div>
\ No newline at end of file
<div id='editmodal_div'></div>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment