[ARVADOS] updated: 82dc8eadba19c7727deeb4056f500fe8e4ba37a6
Git user
git at public.curoverse.com
Wed Nov 2 18:53:48 EDT 2016
Summary of changes:
build/go-python-package-scripts/postinst | 64 +++++++++++++++-------
build/go-python-package-scripts/prerm | 37 +++++++------
build/run-build-docker-jobs-image.sh | 2 +-
doc/_includes/_install_docker_cleaner.liquid | 35 ++++--------
.../controllers/arvados/v1/groups_controller.rb | 13 +++++
services/api/app/models/container_request.rb | 2 +-
services/api/test/unit/container_request_test.rb | 2 +-
.../dockercleaner/arvados-docker-cleaner.service | 7 ++-
services/dockercleaner/arvados_docker/cleaner.py | 21 +++++--
services/dockercleaner/setup.py | 1 +
services/dockercleaner/tests/test_cleaner.py | 6 ++
11 files changed, 120 insertions(+), 70 deletions(-)
via 82dc8eadba19c7727deeb4056f500fe8e4ba37a6 (commit)
via 3cb54d529632df28dd14d1973f70d5fdbd98e2bb (commit)
via 54c1afd044ab18db82d897484cae2153bc14a10c (commit)
via 0a05151f05de44233d3c6ae0d53ecae2855f5a11 (commit)
via cf569180b5121c1d2210a0fc1aa986e207d09af3 (commit)
via 9e2e220996943f6de9a059a6b57c458f60f10e8e (commit)
via b13ad9d7173ac5dff945d4a2ec572510ff0fd5da (commit)
via 69abf05f9257431a2084897dd3e7f1a4b76ae462 (commit)
via 4e9fd075b8136613e7edbb0465bcb96ccf5b1f45 (commit)
via c14d6c107c8b3e2d110be12148e3a04d8ee04ef6 (commit)
via 246413f02ca8711f117a8575fccfec82e5dbfe23 (commit)
via d966c816e478d1747c6e0e39d3430526120c655f (commit)
from cc3857d9fdcd7588af329a9b2452e0ef09eb68a4 (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 82dc8eadba19c7727deeb4056f500fe8e4ba37a6
Author: radhika <radhika at curoverse.com>
Date: Wed Nov 2 18:50:46 2016 -0400
10231: validate_runtime_constraints should occur before set_container filter.
diff --git a/services/api/app/models/container_request.rb b/services/api/app/models/container_request.rb
index d0b3076..05738de 100644
--- a/services/api/app/models/container_request.rb
+++ b/services/api/app/models/container_request.rb
@@ -13,11 +13,11 @@ class ContainerRequest < ArvadosModel
serialize :command, Array
before_validation :fill_field_defaults, :if => :new_record?
+ before_validation :validate_runtime_constraints
before_validation :set_container
validates :command, :container_image, :output_path, :cwd, :presence => true
validate :validate_state_change
validate :validate_change
- validate :validate_runtime_constraints
after_save :update_priority
after_save :finalize_if_needed
before_create :set_requesting_container_uuid
diff --git a/services/api/test/unit/container_request_test.rb b/services/api/test/unit/container_request_test.rb
index b2b0d57..34aa442 100644
--- a/services/api/test/unit/container_request_test.rb
+++ b/services/api/test/unit/container_request_test.rb
@@ -129,7 +129,7 @@ class ContainerRequestTest < ActiveSupport::TestCase
assert_equal({}, c.environment)
assert_equal({"/out" => {"kind"=>"tmp", "capacity"=>1000000}}, c.mounts)
assert_equal "/out", c.output_path
- assert_equal({"vcpus" => 2, "ram" => 30}, c.runtime_constraints)
+ assert_equal({"keep_cache_ram"=>268435456, "vcpus" => 2, "ram" => 30}, c.runtime_constraints)
assert_equal 1, c.priority
assert_raises(ActiveRecord::RecordInvalid) do
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list