[ARVADOS] updated: 7fb94d8c6a6501bb3b440bcf72aaeecfbbfe761c
Git user
git at public.curoverse.com
Tue May 31 09:55:46 EDT 2016
Summary of changes:
backports/python-gflags/fpm-info.sh | 1 -
build/package-build-dockerfiles/centos6/Dockerfile | 5 +-
build/package-build-dockerfiles/debian7/Dockerfile | 3 +-
build/package-build-dockerfiles/debian8/Dockerfile | 3 +-
.../ubuntu1204/Dockerfile | 3 +-
.../ubuntu1404/Dockerfile | 3 +-
build/package-test-dockerfiles/centos6/Dockerfile | 7 +-
build/run-build-packages-one-target.sh | 4 +-
build/run-build-packages-python-and-ruby.sh | 10 +-
build/run-build-packages.sh | 19 +-
crunch_scripts/cwl-runner | 16 +-
doc/_includes/_note_python27_sc.liquid | 2 +-
sdk/cli/arvados-cli.gemspec | 4 +-
sdk/cli/bin/arv | 29 +-
sdk/{ruby => cwl}/LICENSE-2.0.txt | 0
sdk/{python => cwl}/MANIFEST.in | 0
sdk/cwl/arvados_cwl/__init__.py | 124 +++++----
sdk/cwl/setup.py | 5 +-
sdk/cwl/tests/test_job.py | 11 +-
sdk/cwl/tests/test_submit.py | 12 +-
sdk/cwl/tests/tool/submit_tool.cwl | 1 +
sdk/cwl/tests/wf/inputs_test.cwl | 1 +
sdk/cwl/tests/wf/submit_wf.cwl | 1 +
sdk/go/arvadosclient/arvadosclient.go | 2 +-
sdk/go/arvadostest/fixtures.go | 3 +
sdk/python/arvados/commands/arv_copy.py | 100 +++++++
sdk/python/arvados/events.py | 46 ++--
.../tests/{test_websockets.py => test_events.py} | 143 +++++++++-
sdk/ruby/arvados.gemspec | 4 +-
.../v1/api_client_authorizations_controller.rb | 10 +-
.../arvados/v1/containers_controller.rb | 15 ++
services/api/app/middlewares/arvados_api_token.rb | 2 +-
services/api/app/models/container.rb | 116 +++++---
services/api/app/models/container_request.rb | 62 +++--
services/api/config/routes.rb | 5 +-
.../20160506175108_add_auths_to_container.rb | 6 +
...9143250_add_auth_and_lock_to_container_index.rb | 19 ++
services/api/db/structure.sql | 12 +-
services/api/lib/current_api_client.rb | 6 +
services/api/lib/whitelist_update.rb | 4 +-
.../test/fixtures/api_client_authorizations.yml | 6 +
services/api/test/fixtures/container_requests.yml | 13 +
services/api/test/fixtures/containers.yml | 4 +-
.../api_client_authorizations_controller_test.rb | 13 +
.../arvados/v1/containers_controller_test.rb | 52 ++++
services/api/test/test_helper.rb | 4 +
services/api/test/unit/container_request_test.rb | 8 +-
services/api/test/unit/container_test.rb | 295 +++++++++------------
.../crunch-dispatch-local/crunch-dispatch-local.go | 146 ++++++----
.../crunch-dispatch-local_test.go | 19 +-
.../crunch-dispatch-slurm/crunch-dispatch-slurm.go | 227 ++++++++++++----
.../crunch-dispatch-slurm_test.go | 32 ++-
services/crunch-run/crunchrun_test.go | 33 ++-
services/crunch-run/logging_test.go | 23 +-
services/datamanager/collection/collection.go | 14 +-
services/keep-balance/integration_test.go | 2 +-
services/keep-balance/main_test.go | 4 +-
services/keepstore/azure_blob_volume.go | 137 +++++++++-
services/keepstore/azure_blob_volume_test.go | 33 ++-
services/keepstore/s3_volume.go | 4 +-
services/keepstore/volume_generic_test.go | 62 ++++-
services/keepstore/volume_unix.go | 4 +-
services/nodemanager/arvnodeman/baseactor.py | 35 ++-
.../arvnodeman/computenode/dispatch/__init__.py | 69 +++--
services/nodemanager/arvnodeman/config.py | 3 +-
services/nodemanager/arvnodeman/daemon.py | 272 +++++++++----------
services/nodemanager/arvnodeman/launcher.py | 7 +
.../nodemanager/tests/test_computenode_dispatch.py | 40 +--
services/nodemanager/tests/test_daemon.py | 46 ++--
services/nodemanager/tests/test_failure.py | 34 ++-
tools/arvbox/lib/arvbox/docker/Dockerfile.base | 9 +-
71 files changed, 1724 insertions(+), 745 deletions(-)
delete mode 100644 backports/python-gflags/fpm-info.sh
copy sdk/{ruby => cwl}/LICENSE-2.0.txt (100%)
copy sdk/{python => cwl}/MANIFEST.in (100%)
rename sdk/python/tests/{test_websockets.py => test_events.py} (65%)
create mode 100644 services/api/db/migrate/20160506175108_add_auths_to_container.rb
create mode 100644 services/api/db/migrate/20160509143250_add_auth_and_lock_to_container_index.rb
create mode 100644 services/api/test/fixtures/container_requests.yml
create mode 100644 services/api/test/functional/arvados/v1/containers_controller_test.rb
via 7fb94d8c6a6501bb3b440bcf72aaeecfbbfe761c (commit)
via f215d5425814868093bbedc50fe2fe5242681b2c (commit)
via 63e7b750c32f4450f3279558210025b905b5e183 (commit)
via 6cb51851834989ff540c5e2a1fe6b88f1c26a089 (commit)
via 94c78c8792df002805d05cf349094c7833716e65 (commit)
via 44ceaa474a330f12dd9e00115af107d7258044f2 (commit)
via 287c0b37e5ed6787c6b5f28c193b7295388e8c04 (commit)
via 5d5375b28437c59f9625d8653ecef4afec1c2120 (commit)
via 3297c7fb97510aeea14df586d81caf65fd6c4aa6 (commit)
via bde564d8ad6f00326c16d7b85ce6dbeec9d338d3 (commit)
via a5260a0bd87f83b17744445476aaf7f107ca24e4 (commit)
via 5039497244e9cf973d40b377b62889a9356686d1 (commit)
via a1d4ab66c56e0150eb89f0deaafe2cb2a997b61b (commit)
via 0c5e684422234d62870b3c06b9e1014988878099 (commit)
via a6b15a15c6edb39d17ce79d71ec7b0816d7dcc0f (commit)
via 045d2a52055334c7f90725e587925851f7bc326e (commit)
via 22fb8112e4a66280669cc84a44550172b5a438e7 (commit)
via 1eb5f8fe7b290813e2c40a8d248280d488fc37fb (commit)
via d3bd05e221e5b7bf516bb1043bee96ab363c0af8 (commit)
via fedd51d0c04895951920d75147e3640f706653f6 (commit)
via aa1d6f9c5e1e21ceedf855bdb2f6db9154f26669 (commit)
via 25be2534e8746475ddc799042fefa08bd0548e9d (commit)
via cffa542e4cb069b40764c889613c249e88af62d0 (commit)
via 7a430017d745cab4458aa03f620e7925a50b7d06 (commit)
via 08cc91f0493dd8dfe27046faf02c2c907e50443e (commit)
via 3c8c81609c8e9b3b422477002e8a348aabafb3b9 (commit)
via ece22330313613cf4ce8f2b0bd6db4f00bdd08fc (commit)
via e0fac5213f40fc00946f8ec5e4df42bebdf756d2 (commit)
via 5011827dbbe6b17606bf83338b99dd53789ae9cc (commit)
via 0bce01f575822851da09f252b38d7009ed7a5ab0 (commit)
via df8d0badeb97036564a80e89569c8e62ede22163 (commit)
via 1cde74c26fd6a7793a7bb1a9bd748ce06e37c455 (commit)
via 53deed9cb00b94a69a3be1f959cbfda342646718 (commit)
via c8d9a898cde654b53200bda0b0ef8b406dd71739 (commit)
via aea5300167770beb3cca6ad90e5ebb04da961416 (commit)
via 440ad3c54a3a1f5dd8cbf4fc83eba36c9a3e5164 (commit)
via f2cb2d2f14c8509b7e06126fefead0da282ef2fd (commit)
via c193d814c22e2a4227c7f49e76b0d9b589cff4be (commit)
via 2a40242e7f47841c02b4eb9f23a9fafc230b37c4 (commit)
via f3c171cd0091d39203711c480cdfb39ea18cde74 (commit)
via 1fd5716e1714337b6ff96f6725e1f22c7a6ceb65 (commit)
via cdd5523d12bb8cbd88ea897ac3a50cbc1ec7ffce (commit)
via bf3f076d4e1559937dfc4ac27747612df0f8761b (commit)
via 0934e5663b3e3dc0567ecfc71423d970a313578a (commit)
via 5a3d8b2d9e1a504f267d24c63f5fbdb378be2fc6 (commit)
via 6f9bc5a295042fdcc0e51b193d3f31633d58c5d1 (commit)
via c934e8a8519911c203bb75824ae0cf071f7e37b6 (commit)
via f1e8147878e4c940f22ef0dd25355e404375dc11 (commit)
via 5e75d51dd186ae59eeb595b7d0f6a93aa4aef271 (commit)
via 5c549965a11b6a2ce789c1e0db9e418f695aed84 (commit)
via a7a16338702965de3ad0687470ef5beb2f42759b (commit)
via c581b66ad0b54d2e57e4c92da9b04af0dbe4ac67 (commit)
via 99b0c7c39b4941440f0fb8013abcbbdd9ccd12ea (commit)
via 294aaf25b9c2088a20df74d41ced9dc907463d48 (commit)
via caacfc031998dc73cd2f4c767e1a746b7783d379 (commit)
via 4c4387de5857ef00899fcb760a7cfc5ad4b76268 (commit)
via e0d2a1aa4e13da85575cef7ea4136e69b5423ba8 (commit)
via 324d0d6d115488d0ac7fea7aa1a6cff3dd16be0e (commit)
via d2dad24530a065808487a3006ab20a98a67d8fa5 (commit)
via 7f7ed63314bec77bf93edc233514c50a1030cac4 (commit)
via 839a409f51114316c0683fbd00d8174fc24b4a9f (commit)
via 3dd2a1957ae4106bfc2bd5405662c47c087eb79c (commit)
via ec38d4ae1a6597e1f35d5cd0b25f6384666c55be (commit)
via c60995ff0471ce31f0858d1f19a6788014112438 (commit)
via fd75f94f65d11989985bffe8d85fb6da7f75720e (commit)
via a7f30c913114a5e22d5e37b3fba67332f56ce6d9 (commit)
via 3ede205bf0e5af7a88e04009cd66ff111e0729c3 (commit)
via 408acd0b02c1d6f246b3723a9344c68c17d836b2 (commit)
via f1b2f6bf13b5e1a21d429a5b412e82fe84771cdd (commit)
via e348da8c60b35adae6bc9fdf388cebc8aee7dc6b (commit)
via b8be976adfabb17718dee8c569129cdf28036380 (commit)
via 4e2763883588ac691da65ee316a52a052c002aa7 (commit)
via 8e5206a5b1910ee7bc1d0a45af754ce507a7f237 (commit)
via 55923446d946f11f03243ace3281b54ac5a4e80b (commit)
via 14e317f75f2e3ecee53d78012eddaa59ce9e2712 (commit)
via 1b4fa5760aab91a8422dc5d84c73bd627ff1dc51 (commit)
via e6b3755e7447ad14026ce79418e1c2c7f0ef62d1 (commit)
from 335f749ab589d21c87301beb27c0bad84282f6d1 (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 7fb94d8c6a6501bb3b440bcf72aaeecfbbfe761c
Merge: f215d54 63e7b75
Author: Tom Clegg <tom at curoverse.com>
Date: Tue May 31 09:55:16 2016 -0400
Merge remote-tracking branch 'origin/master' into 9162-keep-balance
diff --cc build/package-build-dockerfiles/centos6/Dockerfile
index 397758d,c21c091..570dde1
--- a/build/package-build-dockerfiles/centos6/Dockerfile
+++ b/build/package-build-dockerfiles/centos6/Dockerfile
@@@ -2,10 -2,10 +2,10 @@@ FROM centos:
MAINTAINER Brett Smith <brett at curoverse.com>
# Install build dependencies provided in base distribution
- RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-SCL postgresql-devel
+ RUN yum -q -y install make automake gcc gcc-c++ libyaml-devel patch readline-devel zlib-devel libffi-devel openssl-devel bzip2 libtool bison sqlite-devel rpm-build git perl-ExtUtils-MakeMaker libattr-devel nss-devel libcurl-devel which tar unzip scl-utils centos-release-scl postgresql-devel
# Install golang binary
-ADD generated/golang-amd64.tar.gz /usr/local/
+ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
# Install RVM
diff --cc build/package-build-dockerfiles/debian7/Dockerfile
index 122ffc0,ccc444c..ddad542
--- a/build/package-build-dockerfiles/debian7/Dockerfile
+++ b/build/package-build-dockerfiles/debian7/Dockerfile
@@@ -9,10 -9,11 +9,11 @@@ RUN gpg --keyserver pool.sks-keyservers
curl -L https://get.rvm.io | bash -s stable && \
/usr/local/rvm/bin/rvm install 2.1 && \
/usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
- /usr/local/rvm/bin/rvm-exec default gem install bundler fpm
+ /usr/local/rvm/bin/rvm-exec default gem install bundler && \
+ /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/golang-amd64.tar.gz /usr/local/
+ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
diff --cc build/package-build-dockerfiles/debian8/Dockerfile
index 5262dce,e32cfb4..80f06a2
--- a/build/package-build-dockerfiles/debian8/Dockerfile
+++ b/build/package-build-dockerfiles/debian8/Dockerfile
@@@ -9,10 -9,11 +9,11 @@@ RUN gpg --keyserver pool.sks-keyservers
curl -L https://get.rvm.io | bash -s stable && \
/usr/local/rvm/bin/rvm install 2.1 && \
/usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
- /usr/local/rvm/bin/rvm-exec default gem install bundler fpm
+ /usr/local/rvm/bin/rvm-exec default gem install bundler && \
+ /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/golang-amd64.tar.gz /usr/local/
+ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
diff --cc build/package-build-dockerfiles/ubuntu1204/Dockerfile
index 3eb4d16,34bf698..2f628b0
--- a/build/package-build-dockerfiles/ubuntu1204/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1204/Dockerfile
@@@ -9,10 -9,11 +9,11 @@@ RUN gpg --keyserver pool.sks-keyservers
curl -L https://get.rvm.io | bash -s stable && \
/usr/local/rvm/bin/rvm install 2.1 && \
/usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
- /usr/local/rvm/bin/rvm-exec default gem install bundler fpm
+ /usr/local/rvm/bin/rvm-exec default gem install bundler && \
+ /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/golang-amd64.tar.gz /usr/local/
+ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
diff --cc build/package-build-dockerfiles/ubuntu1404/Dockerfile
index 8a2cfac,5377164..b9c003a
--- a/build/package-build-dockerfiles/ubuntu1404/Dockerfile
+++ b/build/package-build-dockerfiles/ubuntu1404/Dockerfile
@@@ -9,10 -9,11 +9,11 @@@ RUN gpg --keyserver pool.sks-keyservers
curl -L https://get.rvm.io | bash -s stable && \
/usr/local/rvm/bin/rvm install 2.1 && \
/usr/local/rvm/bin/rvm alias create default ruby-2.1 && \
- /usr/local/rvm/bin/rvm-exec default gem install bundler fpm
+ /usr/local/rvm/bin/rvm-exec default gem install bundler && \
+ /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
# Install golang binary
-ADD generated/golang-amd64.tar.gz /usr/local/
+ADD generated/go1.6.2.linux-amd64.tar.gz /usr/local/
RUN ln -s /usr/local/go/bin/go /usr/local/bin/
ENV WORKSPACE /arvados
commit f215d5425814868093bbedc50fe2fe5242681b2c
Author: Tom Clegg <tom at curoverse.com>
Date: Tue May 31 09:52:57 2016 -0400
9162: gofmt
diff --git a/services/keep-balance/integration_test.go b/services/keep-balance/integration_test.go
index 9a5092c..b090614 100644
--- a/services/keep-balance/integration_test.go
+++ b/services/keep-balance/integration_test.go
@@ -9,10 +9,10 @@ import (
"testing"
"time"
+ "git.curoverse.com/arvados.git/sdk/go/arvados"
"git.curoverse.com/arvados.git/sdk/go/arvadosclient"
"git.curoverse.com/arvados.git/sdk/go/arvadostest"
"git.curoverse.com/arvados.git/sdk/go/keepclient"
- "git.curoverse.com/arvados.git/sdk/go/arvados"
check "gopkg.in/check.v1"
)
diff --git a/services/keep-balance/main_test.go b/services/keep-balance/main_test.go
index 38a0b12..4a56098 100644
--- a/services/keep-balance/main_test.go
+++ b/services/keep-balance/main_test.go
@@ -9,14 +9,14 @@ import (
var _ = check.Suite(&mainSuite{})
-type mainSuite struct {}
+type mainSuite struct{}
func (s *mainSuite) TestExampleJSON(c *check.C) {
var config Config
c.Check(json.Unmarshal(exampleConfigFile, &config), check.IsNil)
c.Check(config.KeepServiceTypes, check.DeepEquals, []string{"disk"})
c.Check(config.Client.AuthToken, check.Equals, "xyzzy")
- c.Check(time.Duration(config.RunPeriod), check.Equals, 600 * time.Second)
+ c.Check(time.Duration(config.RunPeriod), check.Equals, 600*time.Second)
}
func (s *mainSuite) TestConfigJSONWithKeepServiceList(c *check.C) {
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list