Collectd Operator Unit Tests

[demo.git] / vnfs / DAaaS / microservices / collectd-operator / Makefile

diff --git a/vnfs/DAaaS/microservices/collectd-operator/Makefile b/vnfs/DAaaS/microservices/collectd-operator/Makefile
index 7effedf..9c02352 100644 (file)
--- a/vnfs/DAaaS/microservices/collectd-operator/Makefile
+++ b/vnfs/DAaaS/microservices/collectd-operator/Makefile
@@ -15,18 +15,19 @@ PROJECTNAME := $(shell basename "$(PWD)")
 ROOTPATH := $(shell realpath "$(PWD)/../")
 COP := ${PWD}/build/_output/bin/collectd-operator
 COP_LOCAL := ${COP}-local
-IMAGE_NAME := dcr.cluster.local:32644/collectd-operator:latest
+ifndef IMAGE_NAME
+override IMAGE_NAME := dcr.cluster.local:32644/collectd-operator:latest
+endif
 
 export GO111MODULE=on
 
 .PHONY: clean plugins
 
 ## build: Generate the k8s and openapi artifacts using operator-sdk
-build: clean
+build: clean format
        GOOS=linux GOARCH=amd64
        operator-sdk generate k8s --verbose
        operator-sdk generate openapi --verbose
-       #@go build -o ${COP} -gcflags all=-trimpath=${ROOTPATH} -asmflags all=-trimpath=${ROOTPATH} collectd-operator/cmd/manager
        @go build -o ${COP_LOCAL} collectd-operator/cmd/manager
        @operator-sdk build ${IMAGE_NAME} --verbose
 
@@ -46,7 +47,7 @@ debug:
        @go build -o ${COP_LOCAL} collectd-operator/cmd/manager
 
 ## deploy: Build Dockerfile and publish to repository
-deploy: build publish
+deploy: build test publish
 
 ## publish: Push docker image to repository
 publish:
@@ -65,7 +66,7 @@ clean:
        @rm -rf ${COP}
        @rm -rf ${COP_LOCAL}
        @echo "Deleting the collectd-operator docker image"
-       @docker rmi ${IMAGE_NAME}
+       @docker 2>/dev/null rmi ${IMAGE_NAME} | true
 
 .PHONY: cover
 ## cover: run tests and generate coverage report