[ARVADOS] updated: 1.3.0-1470-g6a13a5f66

Git user git at public.curoverse.com
Fri Aug 9 15:54:15 UTC 2019 

Summary of changes:
 tools/arvbox/lib/arvbox/docker/Dockerfile.base     |  2 +-
 tools/arvbox/lib/arvbox/docker/crunch-setup.sh     | 40 ----------------------
 .../service/crunch-dispatch0/log/main/.gitstub     |  0
 .../arvbox/docker/service/crunch-dispatch0/log/run |  1 -
 .../lib/arvbox/docker/service/crunch-dispatch0/run |  1 -
 .../docker/service/crunch-dispatch0/run-service    |  6 ----
 .../service/crunch-dispatch1/log/main/.gitstub     |  0
 .../arvbox/docker/service/crunch-dispatch1/log/run |  1 -
 .../lib/arvbox/docker/service/crunch-dispatch1/run |  1 -
 .../docker/service/crunch-dispatch1/run-service    |  7 ----
 10 files changed, 1 insertion(+), 58 deletions(-)
 delete mode 100755 tools/arvbox/lib/arvbox/docker/crunch-setup.sh
 delete mode 100644 tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/log/main/.gitstub
 delete mode 120000 tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/log/run
 delete mode 120000 tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/run
 delete mode 100755 tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/run-service
 delete mode 100644 tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/log/main/.gitstub
 delete mode 120000 tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/log/run
 delete mode 120000 tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/run
 delete mode 100755 tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/run-service

       via  6a13a5f663102b77c157a157c8c4089269d3c3b1 (commit)
      from  14626b1a574924a23f18073b8bb6eff829d66e5a (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 6a13a5f663102b77c157a157c8c4089269d3c3b1
Author: Peter Amstutz <pamstutz at veritasgenetics.com>
Date:   Fri Aug 9 11:40:20 2019 -0400

    15133: Delete crunch v1 from arvbox
    
    Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz at veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index ddbbcb12a..e8b3e6091 100644
--- a/tools/arvbox/lib/arvbox/docker/Dockerfile.base
+++ b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
@@ -104,7 +104,7 @@ RUN echo arvados_version is git commit $arvados_version
 
 ADD fuse.conf /etc/
 
-ADD crunch-setup.sh gitolite.rc \
+ADD gitolite.rc \
     keep-setup.sh common.sh createusers.sh \
     logger runsu.sh waitforpostgres.sh \
     yml_override.py api-setup.sh \
diff --git a/tools/arvbox/lib/arvbox/docker/crunch-setup.sh b/tools/arvbox/lib/arvbox/docker/crunch-setup.sh
deleted file mode 100755
index a36e5891b..000000000
--- a/tools/arvbox/lib/arvbox/docker/crunch-setup.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-exec 2>&1
-set -eux -o pipefail
-
-. /usr/local/lib/arvbox/common.sh
-. /usr/local/lib/arvbox/go-setup.sh
-
-flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/services/crunchstat"
-flock /var/lib/gopath/gopath.lock go get -t "git.curoverse.com/arvados.git/sdk/go/crunchrunner"
-install $GOPATH/bin/crunchstat $GOPATH/bin/crunchrunner /usr/local/bin
-
-if test -s /var/lib/arvados/api_rails_env ; then
-  RAILS_ENV=$(cat /var/lib/arvados/api_rails_env)
-else
-  RAILS_ENV=development
-fi
-
-export ARVADOS_API_HOST=$localip:${services[controller-ssl]}
-export ARVADOS_API_HOST_INSECURE=1
-export ARVADOS_API_TOKEN=$(cat /usr/src/arvados/services/api/superuser_token)
-export CRUNCH_JOB_BIN=/usr/src/arvados/sdk/cli/bin/crunch-job
-export PERLLIB=/usr/src/arvados/sdk/perl/lib
-export CRUNCH_TMP=/tmp/$1
-export CRUNCH_DISPATCH_LOCKFILE=/var/lock/$1-dispatch
-export CRUNCH_JOB_DOCKER_BIN=docker
-export HOME=/tmp/$1
-export CRUNCH_JOB_DOCKER_RUN_ARGS=--net=host
-# Stop excessive stat of /etc/localtime
-export TZ='America/New_York'
-
-cd /usr/src/arvados/services/api
-if test "$1" = "crunch0" ; then
-    exec bundle exec ./script/crunch-dispatch.rb $RAILS_ENV --jobs --pipelines
-else
-    exec bundle exec ./script/crunch-dispatch.rb $RAILS_ENV --jobs
-fi
diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/log/main/.gitstub b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/log/main/.gitstub
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/log/run b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/log/run
deleted file mode 120000
index d6aef4a77..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib/arvbox/logger
\ No newline at end of file
diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/run b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/run
deleted file mode 120000
index a388c8b67..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib/arvbox/runsu.sh
\ No newline at end of file
diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/run-service b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/run-service
deleted file mode 100755
index 2b482ec42..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch0/run-service
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-exec /usr/local/lib/arvbox/crunch-setup.sh crunch0
diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/log/main/.gitstub b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/log/main/.gitstub
deleted file mode 100644
index e69de29bb..000000000
diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/log/run b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/log/run
deleted file mode 120000
index d6aef4a77..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/log/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib/arvbox/logger
\ No newline at end of file
diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/run b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/run
deleted file mode 120000
index a388c8b67..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/run
+++ /dev/null
@@ -1 +0,0 @@
-/usr/local/lib/arvbox/runsu.sh
\ No newline at end of file
diff --git a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/run-service b/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/run-service
deleted file mode 100755
index 0407fb8de..000000000
--- a/tools/arvbox/lib/arvbox/docker/service/crunch-dispatch1/run-service
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-sleep 1
-exec /usr/local/lib/arvbox/crunch-setup.sh crunch1

-----------------------------------------------------------------------


hooks/post-receive
--

More information about the arvados-commits mailing list