[ARVADOS] updated: 7027a116acc02d8c2968d7a6f269172b45f0cd04
Git user
git at public.curoverse.com
Wed Jun 1 18:56:33 EDT 2016
Summary of changes:
apps/workbench/app/models/proxy_work_unit.rb | 14 +-
backports/python-apache-libcloud/fpm-info.sh | 9 +
backports/python-ciso8601/fpm-info.sh | 2 +-
backports/python-llfuse/fpm-info.sh | 2 +-
backports/python-pycrypto/fpm-info.sh | 2 +-
backports/python-pycurl/fpm-info.sh | 2 +-
build/package-build-dockerfiles/Makefile | 14 +-
build/package-build-dockerfiles/centos6/Dockerfile | 2 +-
.../{centos6 => centos7}/Dockerfile | 23 +-
build/package-build-dockerfiles/debian7/Dockerfile | 2 +-
build/package-build-dockerfiles/debian8/Dockerfile | 2 +-
.../ubuntu1204/Dockerfile | 2 +-
.../ubuntu1404/Dockerfile | 2 +-
.../{centos6 => centos7}/Dockerfile | 12 +-
.../{centos6 => centos7}/localrepo.repo | 2 +-
build/package-testing/rpm-common-test-packages.sh | 47 ++
.../test-package-arvados-api-server.sh | 2 +-
.../test-package-arvados-sso-server.sh | 9 +-
.../test-package-arvados-workbench.sh | 2 +-
build/package-testing/test-packages-centos6.sh | 45 +-
build/package-testing/test-packages-centos7.sh | 1 +
build/run-build-packages-one-target.sh | 3 +-
build/run-build-packages-sso.sh | 2 +-
build/run-build-packages.sh | 71 ++-
build/run-library.sh | 37 +-
build/run-tests.sh | 8 +-
sdk/go/arvados/client.go | 169 ++++++
sdk/go/arvados/client_test.go | 83 +++
sdk/go/arvados/collection.go | 62 ++
sdk/go/arvados/doc.go | 12 +
sdk/go/arvados/duration.go | 31 +
sdk/go/arvados/keep_block.go | 15 +
sdk/go/arvados/keep_service.go | 123 ++++
sdk/go/arvados/resource_list.go | 25 +
sdk/go/arvados/resource_list_test.go | 21 +
sdk/go/arvados/user.go | 17 +
services/api/test/fixtures/links.yml | 2 +-
services/keep-balance/balance.go | 638 +++++++++++++++++++++
services/keep-balance/balance_run_test.go | 374 ++++++++++++
services/keep-balance/balance_test.go | 255 ++++++++
services/keep-balance/block_state.go | 95 +++
services/keep-balance/change_set.go | 75 +++
services/keep-balance/change_set_test.go | 35 ++
services/keep-balance/collection.go | 95 +++
services/keep-balance/integration_test.go | 92 +++
services/keep-balance/keep_service.go | 76 +++
services/keep-balance/main.go | 156 +++++
services/keep-balance/main_test.go | 43 ++
services/keep-balance/time_me.go | 14 +
services/keep-balance/usage.go | 83 +++
services/keepstore/keepstore.go | 7 +-
51 files changed, 2775 insertions(+), 142 deletions(-)
create mode 100644 backports/python-apache-libcloud/fpm-info.sh
copy build/package-build-dockerfiles/{centos6 => centos7}/Dockerfile (52%)
copy build/package-test-dockerfiles/{centos6 => centos7}/Dockerfile (53%)
copy build/package-test-dockerfiles/{centos6 => centos7}/localrepo.repo (55%)
create mode 100755 build/package-testing/rpm-common-test-packages.sh
mode change 100755 => 120000 build/package-testing/test-packages-centos6.sh
create mode 120000 build/package-testing/test-packages-centos7.sh
create mode 100644 sdk/go/arvados/client.go
create mode 100644 sdk/go/arvados/client_test.go
create mode 100644 sdk/go/arvados/collection.go
create mode 100644 sdk/go/arvados/doc.go
create mode 100644 sdk/go/arvados/duration.go
create mode 100644 sdk/go/arvados/keep_block.go
create mode 100644 sdk/go/arvados/keep_service.go
create mode 100644 sdk/go/arvados/resource_list.go
create mode 100644 sdk/go/arvados/resource_list_test.go
create mode 100644 sdk/go/arvados/user.go
create mode 100644 services/keep-balance/balance.go
create mode 100644 services/keep-balance/balance_run_test.go
create mode 100644 services/keep-balance/balance_test.go
create mode 100644 services/keep-balance/block_state.go
create mode 100644 services/keep-balance/change_set.go
create mode 100644 services/keep-balance/change_set_test.go
create mode 100644 services/keep-balance/collection.go
create mode 100644 services/keep-balance/integration_test.go
create mode 100644 services/keep-balance/keep_service.go
create mode 100644 services/keep-balance/main.go
create mode 100644 services/keep-balance/main_test.go
create mode 100644 services/keep-balance/time_me.go
create mode 100644 services/keep-balance/usage.go
via 7027a116acc02d8c2968d7a6f269172b45f0cd04 (commit)
via 0a98952530fb465fa31566fa5e0192bea9fc16e4 (commit)
via 79ad282774b6afb9a48445ac3d12d7bb5615e4eb (commit)
via 7961ba6a5a14ab60fbbe181f9d5fcb7df9c4991f (commit)
via 5030797bc2035f1feee5876e069c0282308270ef (commit)
via 76549a60fde774c515121c42ace658dec1a1ebe8 (commit)
via 3aae316c250e83e4c94d3c27359bd01980a99853 (commit)
via c900f416c36cd74675c5bf4c33ad1dbe5d1e78fa (commit)
via 27f948d88bbdd5be848011871d2b592d7057ece1 (commit)
via b002129afda08bbb4fdbed6e629858a5c298c068 (commit)
via ae72b172c8bf8a52358a89f8a8d744ec5bf2d993 (commit)
via 758d39fd7aee4d1989395eba2113f0f2538b30d1 (commit)
via ee65176b19d66ea3b862a65590f9f819c5e69a96 (commit)
via 65d88f48d190ca7a7bfa43215a32df0a622bbdad (commit)
from 2c3500ce771ff9a7cc63a0c92424def877798635 (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 7027a116acc02d8c2968d7a6f269172b45f0cd04
Author: radhika <radhika at curoverse.com>
Date: Wed Jun 1 18:55:37 2016 -0400
8876: child_summary_str checks if total > 0
diff --git a/apps/workbench/app/models/proxy_work_unit.rb b/apps/workbench/app/models/proxy_work_unit.rb
index b8680a6..cd5855a 100644
--- a/apps/workbench/app/models/proxy_work_unit.rb
+++ b/apps/workbench/app/models/proxy_work_unit.rb
@@ -106,16 +106,16 @@ class ProxyWorkUnit < WorkUnit
summary_txt = ''
if state_label == 'Running'
- if summary[:done]
+ done = summary[:done] || 0
+ running = summary[:running] || 0
+ failed = summary[:failed] || 0
+ todo = summary[:todo] || 0
+ total = done + running + failed + todo
+
+ if total > 0
summary_txt += "#{summary[:done]} #{'child'.pluralize(summary[:done])} done,"
- end
- if summary[:failed]
summary_txt += "#{summary[:failed]} failed,"
- end
- if summary[:running]
summary_txt += "#{summary[:running]} running,"
- end
- if summary[:todo]
summary_txt += "#{summary[:todo]} pending"
end
end
commit 0a98952530fb465fa31566fa5e0192bea9fc16e4
Merge: ee65176 79ad282
Author: radhika <radhika at curoverse.com>
Date: Wed Jun 1 15:11:39 2016 -0400
Merge branch 'master' into 8876-work-unit
commit ee65176b19d66ea3b862a65590f9f819c5e69a96
Author: radhika <radhika at curoverse.com>
Date: Tue May 31 13:12:06 2016 -0400
8876: typo in fixture
diff --git a/services/api/test/fixtures/links.yml b/services/api/test/fixtures/links.yml
index 33b9b28..7d9aea5 100644
--- a/services/api/test/fixtures/links.yml
+++ b/services/api/test/fixtures/links.yml
@@ -703,7 +703,7 @@ job_reader_can_read_previous_job_run:
head_uuid: zzzzz-8i9sb-cjs4pklxxjykqqq
job_reader_can_read_foo_repo:
- # Permission link giving job_reader2 permission
+ # Permission link giving job_reader permission
# to read foo_repo
uuid: zzzzz-o0j2j-072ec05dc9487f8
owner_uuid: zzzzz-tpzed-000000000000000
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list