[ARVADOS] updated: ce410ef35e137e040ace097a74a33f04c5975ad9

[git at public.curoverse.com]

Summary of changes:
 services/api/app/controllers/arvados/v1/jobs_controller.rb |  7 +------
 services/api/test/fixtures/jobs.yml                        | 11 +++++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

       via  ce410ef35e137e040ace097a74a33f04c5975ad9 (commit)
      from  4e8745c2a744a2c3e6b44ee6100fb1a26749cebf (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ce410ef35e137e040ace097a74a33f04c5975ad9
Author: Peter Amstutz <peter.amstutz at curoverse.com>
Date:   Fri Sep 26 08:41:58 2014 -0400

    3899: jobs_controller uses state = Queued instead of multiple state columns.
    Updated fixture so that tests pass.

diff --git a/services/api/app/controllers/arvados/v1/jobs_controller.rb b/services/api/app/controllers/arvados/v1/jobs_controller.rb
index d8ceb85..b157de4 100644
--- a/services/api/app/controllers/arvados/v1/jobs_controller.rb
+++ b/services/api/app/controllers/arvados/v1/jobs_controller.rb
@@ -151,12 +151,7 @@ class Arvados::V1::JobsController < ApplicationController
     params[:order] ||= ['priority desc', 'created_at']
     load_limit_offset_order_params
     load_where_param
-    @where.merge!({
-                    started_at: nil,
-                    is_locked_by_uuid: nil,
-                    cancelled_at: nil,
-                    success: nil
-                  })
+    @where.merge!({state: Job::Queued})
     return if false.equal?(load_filters_param)
     find_objects_for_index
     index
diff --git a/services/api/test/fixtures/jobs.yml b/services/api/test/fixtures/jobs.yml
index e677240..a591e67 100644
--- a/services/api/test/fixtures/jobs.yml
+++ b/services/api/test/fixtures/jobs.yml
@@ -20,6 +20,7 @@ running:
     running: 1
     done: 1
   runtime_constraints: {}
+  state: Running
 
 running_cancelled:
   uuid: zzzzz-8i9sb-4cf0nhn6xte809j
@@ -43,6 +44,7 @@ running_cancelled:
     running: 1
     done: 1
   runtime_constraints: {}
+  state: Cancelled
 
 uses_nonexistent_script_version:
   uuid: zzzzz-8i9sb-7m339pu0x9mla88
@@ -66,6 +68,7 @@ uses_nonexistent_script_version:
     running: 0
     done: 1
   runtime_constraints: {}
+  state: Complete
 
 foobar:
   uuid: zzzzz-8i9sb-aceg2bnq7jt7kon
@@ -91,6 +94,7 @@ foobar:
     running: 0
     done: 1
   runtime_constraints: {}
+  state: Complete
 
 barbaz:
   uuid: zzzzz-8i9sb-cjs4pklxxjykyuq
@@ -118,6 +122,7 @@ barbaz:
     running: 0
     done: 1
   runtime_constraints: {}
+  state: Complete
 
 previous_job_run:
   uuid: zzzzz-8i9sb-cjs4pklxxjykqqq
@@ -131,6 +136,7 @@ previous_job_run:
     an_integer: "1"
   success: true
   output: ea10d51bcf88862dbcc36eb292017dfd+45
+  state: Complete
 
 previous_docker_job_run:
   uuid: zzzzz-8i9sb-k6emstgk4kw4yhi
@@ -145,6 +151,7 @@ previous_docker_job_run:
   success: true
   output: ea10d51bcf88862dbcc36eb292017dfd+45
   docker_image_locator: fa3c1a9cb6783f85f2ecda037e07b8c3+167
+  state: Complete
 
 previous_job_run_no_output:
   uuid: zzzzz-8i9sb-cjs4pklxxjykppp
@@ -158,6 +165,7 @@ previous_job_run_no_output:
     an_integer: "2"
   success: true
   output: ~
+  state: Complete
 
 nondeterminisic_job_run:
   uuid: zzzzz-8i9sb-cjs4pklxxjykyyy
@@ -171,6 +179,7 @@ nondeterminisic_job_run:
     an_integer: "1"
   success: true
   nondeterministic: true
+  state: Complete
 
 nearly_finished_job:
   uuid: zzzzz-8i9sb-2gx6rz0pjl033w3
@@ -191,6 +200,7 @@ nearly_finished_job:
     running: 1
     done: 0
   runtime_constraints: {}
+  state: Complete
 
 queued:
   uuid: zzzzz-8i9sb-grx15v5mjnsyxk7
@@ -212,3 +222,4 @@ queued:
   is_locked_by_uuid: ~
   tasks_summary: {}
   runtime_constraints: {}
+  state: Queued
\ No newline at end of file

-----------------------------------------------------------------------


hooks/post-receive
--