Merge pull request os-autoinst#307 from aaannz/a6440_ajaxCloning

action 6440 - canceling reactions

Author: coolo

lib/OpenQA/Scheduler.pm

@@ -879,11 +879,11 @@ sub job_duplicate {
     # set this clone was triggered by manually if it's not auto-clone
     $args{dup_type_auto} = 0 unless defined $args{dup_type_auto};
 
-    log_debug("duplicating $args{jobid}");
-
     my $job = schema->resultset("Jobs")->find({id => $args{jobid}});
-    return undef unless $job;
-    return undef if $job->clone; # already cloned
+    return unless $job;
+    return unless $job->can_be_duplicated; # already cloned
+
+    log_debug("duplicating $args{jobid}");
 
     if($args{dup_type_auto}) {
         if ( int($job->retry_avbl) > 0) {

lib/OpenQA/Schema/Result/Jobs.pm

@@ -266,17 +266,20 @@ sub to_hash {
 
 =item Arguments: none
 
-=item Return value: 1 if a new clon can be created. 0 otherwise.
+=item Return value: 1 if a new clone can be created. undef otherwise.
 
 =back
 
-Checks if a given job can be duplicated.
+Checks if a given job can be duplicated - not cloned yet and in correct state.
 
 =cut
 sub can_be_duplicated{
-    my $self = shift;
+    my ($self) = @_;
 
-    $self->clone ? 0 : 1;
+    my $state = $self->state;
+    return unless (grep {/$state/} (EXECUTION_STATES, FINAL_STATES) );
+    return if $self->clone;
+    return 1;
 }
 
 =head2 duplicate

public/javascripts/tests.js

@@ -197,12 +197,21 @@ function renderTestsList(jobs) {
 	    $('#relevantbox').css('color', 'inherit');
 	} );
     } );
-    $(document).on("click", '.restart', function() {
-	var restart_link = $(this);
-	var link = $(this).parent('span').find('.name');
-	$.post(restart_link.attr("href")).done( function( data ) { $(link).append(' (restarted)'); });
-	$(this).html('');
-    });
-    $(document).on('mouseover', '.parent_child', highlightJobs);
-    $(document).on('mouseout', '.parent_child', unhighlightJobs);
 };
+
+$(document).on("click", '.restart', function() {
+    var restart_link = $(this);
+    var link = $(this).parent('span').find('.name');
+    $.post(restart_link.attr("href")).done( function( data ) { $(link).append(' (restarted)'); });
+    $(this).html('');
+});
+
+$(document).on('click', '.cancel', function() {
+    var cancel_link = $(this);
+    var test = $(this).parent('td');
+    $.post(cancel_link.attr("href")).done( function( data ) { $(test).append(' (cancelled)'); });
+    $(this).html('');
+});
+
+$(document).on('mouseover', '.parent_child', highlightJobs);
+$(document).on('mouseout', '.parent_child', unhighlightJobs);

t/05-scheduler-restart-and-duplicate.t

@@ -38,8 +38,14 @@ my $current_jobs = list_jobs();
 ok(@$current_jobs, "have jobs");
 
 my $job1 = OpenQA::Scheduler::job_get(99927);
+is($job1->{state}, OpenQA::Schema::Result::Jobs::SCHEDULED, 'trying to duplicate scheduled job');
 my $id = OpenQA::Scheduler::job_duplicate(jobid => 99927);
-ok(defined $id, "duplicate works");
+ok(!defined $id, "duplication rejected");
+
+$job1 = OpenQA::Scheduler::job_get(99926);
+is($job1->{state}, OpenQA::Schema::Result::Jobs::DONE, 'trying to duplicate done job');
+$id = OpenQA::Scheduler::job_duplicate(jobid => 99926);
+ok(defined $id, "duplication works");
 
 my $jobs = list_jobs();
 is(@$jobs, @$current_jobs+1, "one more job after duplicating one job");
@@ -51,17 +57,25 @@ delete $job1->{id};
 delete $job1->{settings}->{NAME};
 delete $job2->{id};
 delete $job2->{settings}->{NAME};
+delete $job1->{state};
+delete $job2->{state};
+delete $job1->{result};
+delete $job2->{result};
+delete $job1->{t_finished};
+delete $job2->{t_finished};
+delete $job1->{t_started};
+delete $job2->{t_started};
 is_deeply($job1, $job2, "duplicated job equal");
 
-my @ret = OpenQA::Scheduler::job_restart(99927);
+my @ret = OpenQA::Scheduler::job_restart(99926);
 is(@ret, 0, "no job ids returned");
 
 $jobs = list_jobs();
 is_deeply($jobs, $current_jobs, "jobs unchanged after restarting scheduled job");
 
 OpenQA::Scheduler::job_cancel(99927);
 $job1 = OpenQA::Scheduler::job_get(99927);
-is($job1->{state}, 'cancelled', "scheduled job cancelled after cancelled");
+is($job1->{state}, 'cancelled', "scheduled job cancelled after cancel");
 
 $job1 = OpenQA::Scheduler::job_get(99937);
 @ret = OpenQA::Scheduler::job_restart(99937);
@@ -94,22 +108,30 @@ $job2 = OpenQA::Scheduler::job_get(99963);
 
 is_deeply($job1, $job2, "running job unchanged after cancel");
 
-my $job3 = OpenQA::Scheduler::job_get(99928);
-is($job3->{retry_avbl}, 3, "the retry counter decreased");
-my $round1_id = OpenQA::Scheduler::job_duplicate((jobid => 99928, dup_type_auto => 1));
+my $job3 = OpenQA::Scheduler::job_get(99938);
+is($job3->{retry_avbl}, 3, "the retry counter setup ");
+my $round1_id = OpenQA::Scheduler::job_duplicate((jobid => 99938, dup_type_auto => 1));
 ok(defined $round1_id, "auto-duplicate works");
 $job3 = OpenQA::Scheduler::job_get($round1_id);
 is($job3->{retry_avbl}, 2, "the retry counter decreased");
+# need to change state from scheduled
+OpenQA::Scheduler::job_set_done(jobid => $round1_id, result => OpenQA::Schema::Result::Jobs::INCOMPLETE);
 my $round2_id = OpenQA::Scheduler::job_duplicate((jobid => $round1_id, dup_type_auto => 1));
 ok(defined $round2_id, "auto-duplicate works");
 $job3 = OpenQA::Scheduler::job_get($round2_id);
 is($job3->{retry_avbl}, 1, "the retry counter decreased");
+# need to change state from scheduled
+OpenQA::Scheduler::job_set_done(jobid => $round2_id, result => OpenQA::Schema::Result::Jobs::INCOMPLETE);
 my $round3_id = OpenQA::Scheduler::job_duplicate((jobid => $round2_id, dup_type_auto => 1));
 ok(defined $round3_id, "auto-duplicate works");
 $job3 = OpenQA::Scheduler::job_get($round3_id);
 is($job3->{retry_avbl}, 0, "the retry counter decreased");
+# need to change state from scheduled
+OpenQA::Scheduler::job_set_done(jobid => $round3_id, result => OpenQA::Schema::Result::Jobs::INCOMPLETE);
 my $round4_id = OpenQA::Scheduler::job_duplicate((jobid => $round3_id, dup_type_auto => 1));
-ok(!defined $round4_id, "auto-duplicate works");
+ok(!defined $round4_id, "no logner auto-duplicating");
+# need to change state from scheduled
+OpenQA::Scheduler::job_set_done(jobid => $round3_id, result => OpenQA::Schema::Result::Jobs::INCOMPLETE);
 my $round5_id = OpenQA::Scheduler::job_duplicate(jobid => $round3_id);
 ok(defined $round5_id, "manual-duplicate works");
 $job3 = OpenQA::Scheduler::job_get($round5_id);

t/09-job_clone.t

@@ -66,7 +66,8 @@ is_deeply($m_hashed, $c_hashed, "equivalent job settings (skipping NAME)");
 ok(!$minimalx->can_be_duplicated, "doesn't look cloneable after reloading");
 is($minimalx->duplicate, undef, "cannot clone after reloading");
 
-# But cloning the clone should be possible
+# But cloning the clone should be possible after job state change
+$clone->state(OpenQA::Schema::Result::Jobs::CANCELLED);
 my $second = $clone->duplicate({prio => 35, retry_avbl => 2});
 is($second->test, "minimalx", "same test again");
 is($second->priority, 35, "with adjusted priority");

templates/test/result.html.ep

@@ -3,17 +3,28 @@
 
 % content_for 'ready_function' => begin
     $('.timeago').timeago();
+    $( '#restart-result' ).click( function(event) {
+            event.preventDefault();
+            var doc_url = document.URL.substring(0, document.URL.lastIndexOf("/") + 1);
+            var restart_link = $(this);
+            $.post(restart_link.attr("href")).done( function( data, res, xhr ) {
+                var jobid = xhr.responseJSON.result;
+                if (jobid) {
+                    var url = doc_url + jobid;
+                    window.location = url;
+                }
+            });
+            $(this).html('');
+    });
 % end
 
 <div class="grid_2 alpha">
     <div class="box box-shadow" id="actions_box">
 	<div class="box-header aligncenter">Actions</div>
 	<div class="aligncenter">
-            %# TODO: to use can_be_duplicated we have to wait for https://progress.opensuse.org/issues/1393
-            %#       in the meantime, just check clone_id
-            % unless ($job->clone_id) {
+            % if ($job->can_be_duplicated) {
                 %= link_post url_for('apiv1_restart', name => $testid) => ('data-remote' => 'true', id => 'restart-result') => begin
-                %= image "/images/toggle.png", alt => "schedule", title => "re-schedule"
+                %= image "/images/toggle.png", alt => "schedule", title => "restart"
                 %= end
             % }
 	</div>

templates/test/running_table.html.ep

@@ -49,15 +49,17 @@
                     %= link_to "Build$build" => url_for('tests_overview')->query(%$query);
                     of <%= "$settings->{DISTRI}-$settings->{VERSION}-$settings->{FLAVOR}.$settings->{ARCH}" %>
 		</td>
-		<td class="test">
-		    %= link_to url_for('test', 'testid' => $job->id) => begin
-                    <i class="status state_running fa fa-circle" title="Running"></i>
-		    %= link_post url_for('apiv1_cancel', 'name' => $job->id) => ('data-remote' => 'true') => (class => 'cancel') => begin
-		      <i class="action fa fa-times-circle-o"></i>
-		    % end
-                    %= $testname
-                    % end
-		</td>
+        <td class="test">
+            %= link_to url_for('test', 'testid' => $job->id) => begin
+                <i class="status state_running fa fa-circle" title="Running"></i>
+            % end
+            %= link_post url_for('apiv1_cancel', 'name' => $job->id) => ('data-remote' => 'true') => (class => 'cancel') => begin
+                <i class="action fa fa-times-circle-o"></i>
+            % end
+            %= link_to url_for('test', 'testid' => $job->id) => begin
+                %= $testname
+            % end
+        </td>
 		% my $href = url_for('tests_overview')->query(build => $build, distri => $distri, version => $version);
 		<td class="testtime" title="<%= $job->t_started %>"><%= $job->t_started->datetime() %>Z</td>
 		<td style="padding: 3px 4px;" class="progress">

templates/test/scheduled_table.html.ep

@@ -39,13 +39,15 @@
                     %= link_to "Build$build" => url_for('tests_overview')->query(%$query);
                     of <%= "$settings->{DISTRI}-$settings->{VERSION}-$settings->{FLAVOR}.$settings->{ARCH}" %>
                 </td>
-		<td class="test">
+                <td class="test">
                     %= link_to url_for('test', 'testid' => $job->id) => begin
-                    <i class="status state_scheduled fa fa-circle" title="Scheduled"></i>
-		    %= link_post url_for('apiv1_cancel', 'name' => $job->id) => ('data-remote' => 'true') => (class => 'cancel') => begin
-		      <i class="action fa fa-times-circle-o"></i>
-		    % end
-                    %= $test
+                        <i class="status state_scheduled fa fa-circle" title="Scheduled"></i>
+                    % end
+                    %= link_post url_for('apiv1_cancel', 'name' => $job->id) => ('data-remote' => 'true') => (class => 'cancel') => begin
+                        <i class="action fa fa-times-circle-o"></i>
+                    % end
+                    %= link_to url_for('test', 'testid' => $job->id) => begin
+                        %= $test
                     % end
 		</td>
                 % my $href = url_for('tests_overview')->query(build => $build, distri => $distri, version => $version);