X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/4baccff09d5f8c48cc3c431365f1e029a8c40bb1..05d6c99e5b40c7e0792c44a7c2d9af5b91164f9b:/services/api/app/models/job.rb diff --git a/services/api/app/models/job.rb b/services/api/app/models/job.rb index 1f0ef758d9..e3881ba6e1 100644 --- a/services/api/app/models/job.rb +++ b/services/api/app/models/job.rb @@ -27,6 +27,7 @@ class Job < ArvadosModel t.add :started_at t.add :finished_at t.add :output + t.add :output_is_persistent t.add :success t.add :running t.add :is_locked_by_uuid @@ -36,6 +37,8 @@ class Job < ArvadosModel t.add :dependencies t.add :log_stream_href t.add :log_buffer + t.add :nondeterministic + t.add :repository end def assert_finished @@ -56,6 +59,11 @@ class Job < ArvadosModel order('priority desc, created_at') end + def self.running + self.where('running = ?', true). + order('priority desc, created_at') + end + protected def foreign_key_attributes @@ -70,7 +78,7 @@ class Job < ArvadosModel return true end if new_record? or script_version_changed? - sha1 = Commit.find_by_commit_ish(self.script_version) rescue nil + sha1 = Commit.find_commit_range(current_user, nil, nil, self.script_version, nil)[0] rescue nil if sha1 self.script_version = sha1 else