From a3efd991997d14656af83c7688a0846366c31852 Mon Sep 17 00:00:00 2001
From: Ray Milkey <ray@opennetworking.org>
Date: Mon, 16 Sep 2019 16:16:04 -0700
Subject: [PATCH] Don't run integration tests with -race; current docker images
 don't support it (#672)

---
 Makefile | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 0f7e9c5d5..ad8fc7007 100644
--- a/Makefile
+++ b/Makefile
@@ -11,8 +11,8 @@ MODELPLUGINS = build/_output/testdevice.so.1.0.0 build/_output/testdevice.so.2.0
 
 build: # @HELP build the Go binaries and run all validations (default)
 build: $(MODELPLUGINS)
-	CGO_ENABLED=1 go build -race -o build/_output/onos-config ./cmd/onos-config
-	CGO_ENABLED=1 go build -race -gcflags "all=-N -l" -o build/_output/onos-config-debug ./cmd/onos-config
+	CGO_ENABLED=1 go build -o build/_output/onos-config ./cmd/onos-config
+	CGO_ENABLED=1 go build -gcflags "all=-N -l" -o build/_output/onos-config-debug ./cmd/onos-config
 
 build/_output/testdevice.so.1.0.0: modelplugin/TestDevice-1.0.0/modelmain.go modelplugin/TestDevice-1.0.0/testdevice_1_0_0/generated.go
 	-CGO_ENABLED=1 go build -o build/_output/testdevice.so.1.0.0 -buildmode=plugin -tags=modelplugin ./modelplugin/TestDevice-1.0.0
@@ -87,6 +87,20 @@ kind: images
 
 all: build images
 
+run-docker: # @HELP run onos-config docker image
+run-docker: onos-config-docker
+	docker stop onos-config || echo "onos-config was not running"
+	docker run -d --rm -p 5150:5150 -v `pwd`/configs:/etc/onos-config \
+		--name onos-config onosproject/onos-config \
+		-configStore=/etc/onos-config/configStore-sample.json \
+		-changeStore=/etc/onos-config/changeStore-sample.json \
+		-deviceStore=/etc/onos-config/deviceStore-sample.json \
+		-networkStore=/etc/onos-config/networkStore-sample.json \
+		-modelPlugin=/usr/local/lib/testdevice.so.1.0.0 \
+		-modelPlugin=/usr/local/lib/testdevice.so.2.0.0 \
+		-modelPlugin=/usr/local/lib/devicesim.so.1.0.0 \
+		-modelPlugin=/usr/local/lib/stratum.so.1.0.0
+
 clean: # @HELP remove all the build artifacts
 	rm -rf ./build/_output ./vendor ./cmd/onos-config/onos-config ./cmd/onos/onos