12199: Move services/dispatchcloud to lib/dispatchcloud.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/build/run-tests.sh b/build/run-tests.sh
index 1ef15cd3dbe9974f2fe37619f06845b8964a4ecf..520d3e89d3c5c1a37103371510f22155284fcf90 100755 (executable)
--- a/build/run-tests.sh
+++ b/build/run-tests.sh
@@ -74,10 +74,10 @@ doc
 lib/cli
 lib/cmd
 lib/crunchstat
+lib/dispatchcloud
 services/api
 services/arv-git-httpd
 services/crunchstat
-services/dispatchcloud
 services/dockercleaner
 services/fuse
 services/health
@@ -889,6 +889,7 @@ gostuff=(
     lib/cli
     lib/cmd
     lib/crunchstat
+    lib/dispatchcloud
     sdk/go/arvados
     sdk/go/arvadosclient
     sdk/go/blockdigest
@@ -901,7 +902,6 @@ gostuff=(
     sdk/go/stats
     services/arv-git-httpd
     services/crunchstat
-    services/dispatchcloud
     services/health
     services/keep-web
     services/keepstore

diff --git a/services/dispatchcloud/gocheck_test.go b/lib/dispatchcloud/gocheck_test.go
similarity index 100%
rename from services/dispatchcloud/gocheck_test.go
rename to lib/dispatchcloud/gocheck_test.go

diff --git a/services/dispatchcloud/node_size.go b/lib/dispatchcloud/node_size.go
similarity index 100%
rename from services/dispatchcloud/node_size.go
rename to lib/dispatchcloud/node_size.go

diff --git a/services/dispatchcloud/node_size_test.go b/lib/dispatchcloud/node_size_test.go
similarity index 100%
rename from services/dispatchcloud/node_size_test.go
rename to lib/dispatchcloud/node_size_test.go

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
index 9eebbab02bbc04bde9bd07e6be47333849171662..0879de20f9de4b884e38612f428cfe92b37bfe63 100644 (file)
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm.go
@@ -17,11 +17,11 @@ import (
        "strings"
        "time"
 
+       "git.curoverse.com/arvados.git/lib/dispatchcloud"
        "git.curoverse.com/arvados.git/sdk/go/arvados"
        "git.curoverse.com/arvados.git/sdk/go/arvadosclient"
        "git.curoverse.com/arvados.git/sdk/go/config"
        "git.curoverse.com/arvados.git/sdk/go/dispatch"
-       "git.curoverse.com/arvados.git/services/dispatchcloud"
        "github.com/coreos/go-systemd/daemon"
 )
 

diff --git a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
index 73d9c162e264f18372920fa4406b4f9fa88a8d26..9fb5d6627eefa694181f4223d0e6dad17df45881 100644 (file)
--- a/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
+++ b/services/crunch-dispatch-slurm/crunch-dispatch-slurm_test.go
@@ -20,11 +20,11 @@ import (
        "testing"
        "time"
 
+       "git.curoverse.com/arvados.git/lib/dispatchcloud"
        "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/dispatch"
-       "git.curoverse.com/arvados.git/services/dispatchcloud"
        . "gopkg.in/check.v1"
 )