From c321715e1e5299edf1f720e3b2d9daa64b6f71a5 Mon Sep 17 00:00:00 2001
From: Zachary Wasserman <zach@dactiv.llc>
Date: Mon, 29 Jul 2019 10:08:54 -0700
Subject: [PATCH] Enable MySQL tests in CI config (#2082)

---
 .circleci/config.yml | 8 +++++++-
 Makefile             | 2 --
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index ef59b1725a..f19bc8bed1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -3,6 +3,12 @@ jobs:
   build-go:
     docker:
       - image: golang:1.12
+      - image: mysql:5.7
+        environment:
+          MYSQL_ROOT_PASSWORD: toor
+          MYSQL_DATABASE: kolide
+          MYSQL_USER: kolide
+          MYSQL_PASSWORD: kolide
     working_directory: /go/src/github.com/kolide/fleet
     steps: &stepsgo
       - checkout
@@ -27,7 +33,7 @@ jobs:
             - vendor
       - run: make generate-go
       - run: make lint-go
-      - run: make test-go
+      - run: MYSQL_TEST=1 MYSQL_PORT_3306_TCP_ADDR=127.0.0.1 make test-go
       - run: make build
 
   build-js:
diff --git a/Makefile b/Makefile
index d7eda1c5a5..a3b37490da 100644
--- a/Makefile
+++ b/Makefile
@@ -130,7 +130,6 @@ test-go:
 analyze-go:
 	go test -race -cover ./...
 
-
 test-js: export NODE_PATH = ./frontend
 test-js:
 	_mocha --compilers js:babel-core/register,tsx:typescript-require  \
@@ -152,7 +151,6 @@ generate-go: .prefix
 		frontend/templates/ assets/...
 	go-bindata -pkg=kolide -o=server/kolide/bindata.go server/mail/templates
 
-
 # we first generate the webpack bundle so that bindata knows to watch the
 # output bundle file. then, generate debug bindata source file. finally, we
 # run webpack in watch mode to continuously re-generate the bundle