Update CI for moved migrations.

Signed-off-by: Tom Wilkie <[email protected]>

Author: tomwilkie

.circleci/config.yml

@@ -56,7 +56,7 @@ jobs:
     - checkout
     - run:
         name: Integration Test
-        command: MIGRATIONS_DIR=$(pwd)/pkg/configs/db/migrations make BUILD_IN_CONTAINER=false configs-integration-test
+        command: MIGRATIONS_DIR=$(pwd)/cmd/cortex/migrations make BUILD_IN_CONTAINER=false configs-integration-test
 
   build:
     <<: *defaults

Makefile

@@ -101,9 +101,9 @@ configs-integration-test: build-image/$(UPTODATE)
 		-v $(shell pwd)/.pkg:/go/pkg \
 		-v $(shell pwd):/go/src/github.com/cortexproject/cortex \
 		-v $(shell pwd)/cmd/cortex/migrations:/migrations \
-		-e MIGRATIONS_DIR=/migrations \
 		--workdir /go/src/github.com/cortexproject/cortex \
 		--link "$$DB_CONTAINER":configs-db.cortex.local \
+		-e DB_ADDR=configs-db.cortex.local \
 		$(IMAGE_PREFIX)build-image $@; \
 	status=$$?; \
 	test -n "$(CIRCLECI)" || docker rm -f "$$DB_CONTAINER"; \
@@ -136,7 +136,7 @@ shell:
 	bash
 
 configs-integration-test:
-	/bin/bash -c "go test -tags 'netgo integration' -timeout 30s ./pkg/configs/... ./pkg/ruler/..."
+	/bin/bash -c "go test -v -tags 'netgo integration' -timeout 30s ./pkg/configs/... ./pkg/ruler/..."
 
 mod-check:
 	GO111MODULE=on go mod download
@@ -167,7 +167,7 @@ load-images:
 		fi \
 	done
 
-# Loads the built Docker images into the minikube environmen, and tags them with
+# Loads the built Docker images into the minikube environment, and tags them with
 # "latest" so the k8s manifests shipped with this code work.
 prime-minikube: save-images
 	eval $$(minikube docker-env) ; \

pkg/configs/db/dbtest/integration.go

@@ -16,16 +16,29 @@ import (
 
 var (
 	done          chan error
+	dbAddr        string
+	migrationsDir string
 	errRollback   = fmt.Errorf("Rolling back test data")
-	migrationsDir = os.Getenv("MIGRATIONS_DIR")
 )
 
+func init() {
+	dbAddr = os.Getenv("DB_ADDR")
+	if dbAddr == "" {
+		dbAddr = "127.0.0.1"
+	}
+
+	migrationsDir = os.Getenv("MIGRATIONS_DIR")
+	if migrationsDir == "" {
+		migrationsDir = "/migrations"
+	}
+}
+
 // Setup sets up stuff for testing, creating a new database
 func Setup(t *testing.T) db.DB {
 	require.NoError(t, logging.Setup("debug"))
 	// Don't use db.MustNew, here so we can do a transaction around the whole test, to rollback.
 	pg, err := postgres.New(
-		"postgres://postgres@127.0.0.1/configs_test?sslmode=disable",
+		fmt.Sprintf("postgres://postgres@%s/configs_test?sslmode=disable", dbAddr),
 		migrationsDir,
 	)
 	require.NoError(t, err)