15133: Delete crunch v1 from arvbox

Arvados-DCO-1.1-Signed-off-by: Peter Amstutz <pamstutz@veritasgenetics.com>

diff --git a/tools/arvbox/lib/arvbox/docker/Dockerfile.base b/tools/arvbox/lib/arvbox/docker/Dockerfile.base
index ddbbcb12af4ff9b6362e2d381fc243c570985885..e8b3e60910189b11b97d9c42ae073cef082c3b63 100644 (file)
--- 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 (executable)
index a36e589..0000000
--- 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 (file)
index e69de29..0000000

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 (symlink)
index d6aef4a..0000000
--- 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 (symlink)
index a388c8b..0000000
--- 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 (executable)
index 2b482ec..0000000
--- 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 (file)
index e69de29..0000000

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 (symlink)
index d6aef4a..0000000
--- 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 (symlink)
index a388c8b..0000000
--- 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 (executable)
index 0407fb8..0000000
--- 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