X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/afb710394b65fc82da8e4edd024a3a5fc1a18d54..3aaefcb3c76ff470b475d950398d01255e87712a:/services/arv-git-httpd/gitolite_test.go

diff --git a/services/arv-git-httpd/gitolite_test.go b/services/arv-git-httpd/gitolite_test.go
index 0656cbf89a..fb0fc0d783 100644
--- a/services/arv-git-httpd/gitolite_test.go
+++ b/services/arv-git-httpd/gitolite_test.go
@@ -10,8 +10,9 @@ import (
 	"os/exec"
 	"strings"
 
-	"git.curoverse.com/arvados.git/sdk/go/arvados"
-	"git.curoverse.com/arvados.git/sdk/go/arvadostest"
+	"git.arvados.org/arvados.git/lib/config"
+	"git.arvados.org/arvados.git/sdk/go/arvados"
+	"git.arvados.org/arvados.git/sdk/go/ctxlog"
 	check "gopkg.in/check.v1"
 )
 
@@ -47,16 +48,18 @@ func (s *GitoliteSuite) SetUpTest(c *check.C) {
 	runGitolite("gitolite", "setup", "--admin", "root")
 
 	s.tmpRepoRoot = s.gitoliteHome + "/repositories"
-	s.Config = &Config{
-		Client: arvados.Client{
-			APIHost:  arvadostest.APIHost(),
-			Insecure: true,
-		},
-		Listen:       ":0",
-		GitCommand:   "/usr/share/gitolite3/gitolite-shell",
-		GitoliteHome: s.gitoliteHome,
-		RepoRoot:     s.tmpRepoRoot,
-	}
+
+	cfg, err := config.NewLoader(nil, ctxlog.TestLogger(c)).Load()
+	c.Assert(err, check.Equals, nil)
+	s.cluster, err = cfg.GetCluster("")
+	c.Assert(err, check.Equals, nil)
+
+	s.cluster.Services.GitHTTP.InternalURLs = map[arvados.URL]arvados.ServiceInstance{{Host: "localhost:0"}: {}}
+	s.cluster.TLS.Insecure = true
+	s.cluster.Git.GitCommand = "/usr/share/gitolite3/gitolite-shell"
+	s.cluster.Git.GitoliteHome = s.gitoliteHome
+	s.cluster.Git.Repositories = s.tmpRepoRoot
+
 	s.IntegrationSuite.SetUpTest(c)
 
 	// Install the gitolite hooks in the bare repo we made in