[ARVADOS] updated: 1767cc94ddd427c6610c82e1b27f6a9f6793b39a
Git user
git at public.curoverse.com
Sat Dec 31 15:29:38 EST 2016
Summary of changes:
.../app/controllers/projects_controller.rb | 10 +-
.../test/controllers/projects_controller_test.rb | 9 +-
backports/deb-fuse/fpm-info.sh | 5 +
backports/deb-libfuse-dev/fpm-info.sh | 5 +
backports/python-llfuse/fpm-info.sh | 10 +-
backports/rpm-fuse-devel/fpm-info.sh | 5 +
backports/rpm-fuse/fpm-info.sh | 5 +
build/package-test-dockerfiles/centos7/Dockerfile | 4 +-
build/package-test-dockerfiles/debian8/Dockerfile | 7 +-
.../package-test-dockerfiles/ubuntu1204/Dockerfile | 9 +-
.../package-test-dockerfiles/ubuntu1404/Dockerfile | 9 +-
build/package-testing/test-packages-centos6.sh | 1 -
build/run-build-packages-one-target.sh | 3 +
build/run-build-packages.sh | 12 +-
build/run-library.sh | 2 +-
build/run-tests.sh | 11 +-
sdk/cli/bin/crunch-job | 2 +-
sdk/cwl/arvados_cwl/__init__.py | 27 +++-
sdk/cwl/arvados_cwl/arvcontainer.py | 42 ++++---
sdk/cwl/arvados_cwl/arvjob.py | 14 ++-
sdk/cwl/arvados_cwl/arvworkflow.py | 3 +
sdk/cwl/arvados_cwl/crunch_script.py | 5 +-
sdk/cwl/arvados_cwl/done.py | 29 ++++-
sdk/cwl/arvados_cwl/runner.py | 64 ++++++----
sdk/cwl/tests/test_submit.py | 19 ++-
sdk/go/arvados/collection.go | 4 +-
sdk/go/arvados/resource_list.go | 11 +-
.../arvados/v1/collections_controller.rb | 30 ++++-
services/api/app/middlewares/rack_socket.rb | 20 ++-
services/api/app/models/arvados_model.rb | 2 +-
services/api/app/models/collection.rb | 98 ++++++++++++---
services/api/config/application.default.yml | 9 +-
services/api/config/routes.rb | 1 +
...61222153434_split_expiry_to_trash_and_delete.rb | 42 +++++++
services/api/db/structure.sql | 45 +++++--
services/api/lib/eventbus.rb | 1 +
services/api/lib/load_param.rb | 3 +-
services/api/lib/sweep_trashed_collections.rb | 34 +++++
services/api/test/fixtures/collections.yml | 41 +++++-
.../arvados/v1/collections_controller_test.rb | 65 ++++++++++
services/api/test/integration/select_test.rb | 7 ++
services/api/test/unit/collection_test.rb | 140 +++++++++++++++++++--
services/arv-web/arv-web.py | 2 +-
services/crunch-run/crunchrun.go | 4 +-
services/fuse/arvados_fuse/__init__.py | 45 +++----
services/fuse/setup.py | 2 +-
services/fuse/tests/test_mount.py | 12 +-
services/keep-balance/balance_run_test.go | 5 +-
services/keep-balance/collection.go | 22 ++--
services/keepstore/pipe_adapters.go | 89 +++++++++++++
services/keepstore/volume.go | 12 ++
services/keepstore/volume_unix.go | 92 +++++++++-----
services/keepstore/volume_unix_test.go | 50 ++++++--
53 files changed, 971 insertions(+), 229 deletions(-)
create mode 100644 backports/deb-fuse/fpm-info.sh
create mode 100644 backports/deb-libfuse-dev/fpm-info.sh
create mode 100644 backports/rpm-fuse-devel/fpm-info.sh
create mode 100644 backports/rpm-fuse/fpm-info.sh
delete mode 120000 build/package-testing/test-packages-centos6.sh
create mode 100644 services/api/db/migrate/20161222153434_split_expiry_to_trash_and_delete.rb
create mode 100644 services/api/lib/sweep_trashed_collections.rb
create mode 100644 services/keepstore/pipe_adapters.go
discards 0f147b2083e80f103a00bd261867359fd69f68e4 (commit)
via 1767cc94ddd427c6610c82e1b27f6a9f6793b39a (commit)
via d0d60bbbe1c60516334e5d56f3c923b79e611b21 (commit)
via 9048749c1419cf5e130a4b5d992a2b9c5bafd9cf (commit)
via b405f0f487f35f62d8362dc06981b83176b77d44 (commit)
via 4c76ae6b65612579e465a2862f3c2bdfea06b43a (commit)
via 8d0b0fc4046a01a1aeaebb177c3b740237728c25 (commit)
via a12864a31d5569c74ed32157d5fe928a1c2563b7 (commit)
via 29246b83f1b1c66eb12ed53c844ef37ee0b77568 (commit)
via 3f556ca1b44b7e01874bd172abbb7cb3df0615db (commit)
via b4d9dfe1e7acb1f45c2cc699020bf9299a0db5c9 (commit)
via b3e5ea60bdecb41fbf954b67ab859dc4542d0c1a (commit)
via b9df977af1ca8d7fe942cbe13956fa19ed88b91d (commit)
via 1fa9990d33e5cde82d5986b382851b8ea0314553 (commit)
via 9c7a9a6e4660b3e7cc6419e5818ffaa3a78b6d19 (commit)
via 7d6cb0405504a536a88aa8467e474f7fd13299a7 (commit)
via d02ba63331267f782e0bc5868ca4aab456e0f2b4 (commit)
via e367f2eea8974cc137b2c74bfbfcf0e5d334f15f (commit)
via 48d810686a66ac2d554d4f5696fda9a61904992c (commit)
via 7fc1b26a40065518dd5cfc8eaf6259fa1288bd92 (commit)
via e99a8f26537ef2356be5fc479bfe8c4f716c8d22 (commit)
via bfe7a62407aa0a6bc078659f259468f9b4105581 (commit)
via cc33861d2b29e1a0bd63f3c9b9322bd86e3fb5e4 (commit)
via 973c9d87c964cd517704b8f0ba487a644f5d635d (commit)
via d1f91106df53f5333acdfc5ec299c852d8ddfb46 (commit)
via 25c212007d4c6ef14cf730526246bc8876700bb6 (commit)
via 5627b1bf40d759cef1670afa6875005d9ca7e691 (commit)
via 31d8056dbcaf236299729694b3e63882cb42dde2 (commit)
via 42759ae4288f20646ae64bf7d09db26b713d531b (commit)
via 31084ffe95eddee3469674b6f719e00e94de9b5d (commit)
via ea9d53175a0e7670ceb9bbeaf66cd6c89baa09dd (commit)
via a166056578bc02193e1a83f79b2477c9ccd98cc2 (commit)
via b3f306edf87bf1fe406f11b5c99947d73599f84f (commit)
via f82d2a3731310b55420f7dcfe9a7ad28c3b338f1 (commit)
via 4030410ea30f122acb7e67844b1adcd7ed7107fa (commit)
via fabbab6fb71b4733260687cd58a455b16c00948a (commit)
via 568c7abf660b7a68f70b6ea47ae2e7352233f053 (commit)
via 7f9a68fbef2de18f274437b6161cd7269d87f04e (commit)
via a4f7583ef9d76101415bace9b250df983ba7212d (commit)
via 5af0f99a1dc3d6dbc9066c2649272abf27482ebf (commit)
via 970835342e02cb7a97f228f67602b7f847ab6875 (commit)
via 1f5fee78438f06ec9531939247321dfb30af2b1a (commit)
via 25275859b01a1f8c8bff018878842d194d99c173 (commit)
via b9f7a8693579045f05d142dba8bffd2c5660dfce (commit)
via 6cec281e8653731602ab871cc41ddd21ca8182ab (commit)
via 4ee5a6efb8b01afddddaa8ce5ed7d0de42a287d6 (commit)
via eebb0457f1bb69ec2084cbefcbff8c19e404d556 (commit)
via 0aa01993bc8533d417dc510b1860a4a583e093b4 (commit)
via cdd8dc7bc4cca452e25c5b014e5f2bb592fb31ce (commit)
This update added new revisions after undoing existing revisions. That is
to say, the old revision is not a strict subset of the new revision. This
situation occurs when you --force push a change and generate a repository
containing something like this:
* -- * -- B -- O -- O -- O (0f147b2083e80f103a00bd261867359fd69f68e4)
\
N -- N -- N (1767cc94ddd427c6610c82e1b27f6a9f6793b39a)
When this happens we assume that you've already had alert emails for all
of the O revisions, and so we here report only the revisions in the N
branch from the common base, B.
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 1767cc94ddd427c6610c82e1b27f6a9f6793b39a
Author: Ward Vandewege <ward at curoverse.com>
Date: Sat Dec 31 15:27:51 2016 -0500
Remove additional CentOS6 files.
refs #10786
diff --git a/build/package-test-dockerfiles/centos6/Dockerfile b/build/package-test-dockerfiles/centos6/Dockerfile
deleted file mode 100644
index 46229cf..0000000
--- a/build/package-test-dockerfiles/centos6/Dockerfile
+++ /dev/null
@@ -1,22 +0,0 @@
-FROM centos:6
-MAINTAINER Peter Amstutz <peter.amstutz at curoverse.com>
-
-RUN yum -q install --assumeyes scl-utils centos-release-scl \
- which tar
-
-# Install RVM
-RUN touch /var/lib/rpm/* && \
- gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
- curl -L https://get.rvm.io | bash -s stable && \
- /usr/local/rvm/bin/rvm install 2.3 && \
- /usr/local/rvm/bin/rvm alias create default ruby-2.3 && \
- /usr/local/rvm/bin/rvm-exec default gem install bundle && \
- /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
-
-RUN cd /tmp && \
- (curl -OLf 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' || \
- curl -OLf 'http://repoforge.eecs.wsu.edu/redhat/el6/en/x86_64/rpmforge/RPMS/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm') && \
- rpm -ivh rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm && \
- sed -i 's/enabled = 0/enabled = 1/' /etc/yum.repos.d/rpmforge.repo
-
-COPY localrepo.repo /etc/yum.repos.d/localrepo.repo
diff --git a/build/package-testing/test-packages-centos6.sh b/build/package-testing/test-packages-centos6.sh
deleted file mode 120000
index 64ef604..0000000
--- a/build/package-testing/test-packages-centos6.sh
+++ /dev/null
@@ -1 +0,0 @@
-rpm-common-test-packages.sh
\ No newline at end of file
commit d0d60bbbe1c60516334e5d56f3c923b79e611b21
Author: Ward Vandewege <ward at curoverse.com>
Date: Thu Dec 29 10:33:29 2016 -0500
Remove CentOS6 support from the build directory.
refs #10786
diff --git a/build/package-build-dockerfiles/Makefile b/build/package-build-dockerfiles/Makefile
index 624d5f2..9987e9e 100644
--- a/build/package-build-dockerfiles/Makefile
+++ b/build/package-build-dockerfiles/Makefile
@@ -1,8 +1,4 @@
-all: centos6/generated centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
-
-centos6/generated: common-generated-all
- test -d centos6/generated || mkdir centos6/generated
- cp -rlt centos6/generated common-generated/*
+all: centos7/generated debian8/generated ubuntu1204/generated ubuntu1404/generated
centos7/generated: common-generated-all
test -d centos7/generated || mkdir centos7/generated
diff --git a/build/package-build-dockerfiles/centos6/Dockerfile b/build/package-build-dockerfiles/centos6/Dockerfile
deleted file mode 100644
index 8ea81f4..0000000
--- a/build/package-build-dockerfiles/centos6/Dockerfile
+++ /dev/null
@@ -1,37 +0,0 @@
-FROM centos:6
-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
-
-# Install golang binary
-ADD generated/go1.7.1.linux-amd64.tar.gz /usr/local/
-RUN ln -s /usr/local/go/bin/go /usr/local/bin/
-
-# Install RVM
-RUN gpg --keyserver pool.sks-keyservers.net --recv-keys D39DC0E3 && \
- 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 && \
- /usr/local/rvm/bin/rvm-exec default gem install cure-fpm --version 1.6.0b
-
-# Need to "touch" RPM database to workaround bug in interaction between
-# overlayfs and yum (https://bugzilla.redhat.com/show_bug.cgi?id=1213602)
-RUN touch /var/lib/rpm/* && yum -q -y install python27 python33
-RUN scl enable python33 "easy_install-3.3 pip" && scl enable python27 "easy_install-2.7 pip"
-
-# fpm requires ffi which now wants xz-libs-5 which isn't packaged for centos6
-# but the library from xz-libs-4.999 appears to be good enough.
-RUN ln -s /usr/lib64/liblzma.so.0 /usr/lib64/lzma.so.5
-
-RUN cd /tmp && \
- (curl -OLf 'http://pkgs.repoforge.org/rpmforge-release/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm' || \
- curl -OLf 'http://repoforge.eecs.wsu.edu/redhat/el6/en/x86_64/rpmforge/RPMS/rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm') && \
- rpm -ivh rpmforge-release-0.5.3-1.el6.rf.x86_64.rpm && \
- sed -i 's/enabled = 0/enabled = 1/' /etc/yum.repos.d/rpmforge.repo
-
-RUN touch /var/lib/rpm/* && yum install --assumeyes git
-
-ENV WORKSPACE /arvados
-CMD ["scl", "enable", "python33", "python27", "/usr/local/rvm/bin/rvm-exec default bash /jenkins/run-build-packages.sh --target centos6"]
diff --git a/build/package-test-dockerfiles/centos6/localrepo.repo b/build/package-test-dockerfiles/centos6/localrepo.repo
deleted file mode 100644
index ac6b898..0000000
--- a/build/package-test-dockerfiles/centos6/localrepo.repo
+++ /dev/null
@@ -1,5 +0,0 @@
-[localrepo]
-name=Arvados Test
-baseurl=file:///arvados/packages/centos6
-gpgcheck=0
-enabled=1
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 958067c..348dd7b 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -145,10 +145,6 @@ if test -z "$packages" ; then
libarvados-perl"
case "$TARGET" in
- centos6)
- packages="$packages python27-python-arvados-fuse
- python27-python-arvados-python-client python27-python-arvados-cwl-runner"
- ;;
*)
packages="$packages python-arvados-fuse
python-arvados-python-client python-arvados-cwl-runner"
diff --git a/build/run-build-packages-sso.sh b/build/run-build-packages-sso.sh
index c8b2529..264f27d 100755
--- a/build/run-build-packages-sso.sh
+++ b/build/run-build-packages-sso.sh
@@ -77,7 +77,7 @@ case "$TARGET" in
ubuntu1404)
FORMAT=deb
;;
- centos6|centos7)
+ centos7)
FORMAT=rpm
;;
*)
diff --git a/build/run-build-packages.sh b/build/run-build-packages.sh
index cfdc3da..29b7e8c 100755
--- a/build/run-build-packages.sh
+++ b/build/run-build-packages.sh
@@ -132,27 +132,6 @@ case "$TARGET" in
cachecontrol 'pathlib2>=2.1.0')
PYTHON3_BACKPORTS=(docker-py==1.7.2 requests websocket-client==0.37.0)
;;
- centos6)
- FORMAT=rpm
- PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n')
- PYTHON2_PKG_PREFIX=$PYTHON2_PACKAGE
- PYTHON2_PREFIX=/opt/rh/python27/root/usr
- PYTHON2_INSTALL_LIB=lib/python$PYTHON2_VERSION/site-packages
- PYTHON3_PACKAGE=$(rpm -qf "$(which python$PYTHON3_VERSION)" --queryformat '%{NAME}\n')
- PYTHON3_PKG_PREFIX=$PYTHON3_PACKAGE
- PYTHON3_PREFIX=/opt/rh/python33/root/usr
- PYTHON3_INSTALL_LIB=lib/python$PYTHON3_VERSION/site-packages
- PYTHON_BACKPORTS=(python-gflags==2.0 google-api-python-client==1.4.2 \
- oauth2client==1.5.2 pyasn1==0.1.7 pyasn1-modules==0.0.5 \
- rsa uritemplate httplib2 ws4py pykka six \
- ciso8601 pycrypto backports.ssl_match_hostname 'pycurl<7.21.5' \
- python-daemon 'llfuse>=1.0' 'pbr<1.0' pyyaml contextlib2 \
- 'rdflib>=4.2.0' shellescape mistune typing avro requests \
- isodate pyparsing sparqlwrapper html5lib==0.9999999 keepalive \
- ruamel.ordereddict cachecontrol 'pathlib2>=2.1.0')
- PYTHON3_BACKPORTS=(docker-py==1.7.2 six requests websocket-client==0.37.0)
- export PYCURL_SSL_LIBRARY=nss
- ;;
centos7)
FORMAT=rpm
PYTHON2_PACKAGE=$(rpm -qf "$(which python$PYTHON2_VERSION)" --queryformat '%{NAME}\n')
@@ -364,38 +343,6 @@ if [[ $TARGET =~ ubuntu1204 ]]; then
"$WORKSPACE/packages/$TARGET/libfuse-dev_2.9.2-5_amd64.deb"
apt-get -y --no-install-recommends -f install
rm -rf $LIBFUSE_DIR
-elif [[ $TARGET =~ centos6 ]]; then
- # port fuse 2.9.2 to centos 6
- # install tools to build rpm from source
- yum install -y rpm-build redhat-rpm-config
- LIBFUSE_DIR=$(mktemp -d)
- (
- cd "$LIBFUSE_DIR"
- # download fuse 2.9.2 centos 7 source rpm
- file="fuse-2.9.2-6.el7.src.rpm" && curl -L -o "${file}" "http://vault.centos.org/7.2.1511/os/Source/SPackages/${file}"
- (
- # modify source rpm spec to remove conflict on filesystem version
- mkdir -p /root/rpmbuild/SOURCES
- cd /root/rpmbuild/SOURCES
- rpm2cpio ${LIBFUSE_DIR}/fuse-2.9.2-6.el7.src.rpm | cpio -i
- perl -pi -e 's/Conflicts:\s*filesystem.*//g' fuse.spec
- )
- # build rpms from source
- rpmbuild -bb /root/rpmbuild/SOURCES/fuse.spec
- rm -f fuse-2.9.2-6.el7.src.rpm
- # move built RPMs to LIBFUSE_DIR
- mv "/root/rpmbuild/RPMS/x86_64/fuse-2.9.2-6.el6.x86_64.rpm" ${LIBFUSE_DIR}/
- mv "/root/rpmbuild/RPMS/x86_64/fuse-libs-2.9.2-6.el6.x86_64.rpm" ${LIBFUSE_DIR}/
- mv "/root/rpmbuild/RPMS/x86_64/fuse-devel-2.9.2-6.el6.x86_64.rpm" ${LIBFUSE_DIR}/
- rm -rf /root/rpmbuild
- )
- fpm_build "$LIBFUSE_DIR/fuse-libs-2.9.2-6.el6.x86_64.rpm" fuse-libs "Centos Developers" rpm "2.9.2" --iteration 5
- fpm_build "$LIBFUSE_DIR/fuse-2.9.2-6.el6.x86_64.rpm" fuse "Centos Developers" rpm "2.9.2" --iteration 5 --no-auto-depends
- fpm_build "$LIBFUSE_DIR/fuse-devel-2.9.2-6.el6.x86_64.rpm" fuse-devel "Centos Developers" rpm "2.9.2" --iteration 5 --no-auto-depends
- yum install -y \
- "$WORKSPACE/packages/$TARGET/fuse-libs-2.9.2-5.x86_64.rpm" \
- "$WORKSPACE/packages/$TARGET/fuse-2.9.2-5.x86_64.rpm" \
- "$WORKSPACE/packages/$TARGET/fuse-devel-2.9.2-5.x86_64.rpm"
fi
# Go binaries
commit 9048749c1419cf5e130a4b5d992a2b9c5bafd9cf
Merge: 0d6b95b b405f0f
Author: Ward Vandewege <ward at curoverse.com>
Date: Sat Dec 31 15:20:11 2016 -0500
Merge branch 'master' into 10786-remove-centos6-from-build-directory
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list