From: Victor Morales Date: Wed, 5 Sep 2018 13:40:25 +0000 (-0700) Subject: Move mock plugin compilation X-Git-Tag: 3.0.0-ONAP~53^2 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=492d0913b06d848200d1d6f04ad2d51569fd8c1a;p=multicloud%2Fk8s.git Move mock plugin compilation The instruction that compiles the Mock plugin is only required during the testing, therefore this instruction can be moved in different place in the Makefile Change-Id: Ib800b2b39992a1020e466aa3f22cada5ac84bcf6 Signed-off-by: Victor Morales Issue-ID: MULTICLOUD-301 --- diff --git a/src/k8splugin/Makefile b/src/k8splugin/Makefile index 3aa8223f..542de958 100644 --- a/src/k8splugin/Makefile +++ b/src/k8splugin/Makefile @@ -1,13 +1,11 @@ -# Copyright 2018 Intel Corporation. -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# http://www.apache.org/licenses/LICENSE-2.0 -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-license-identifier: Apache-2.0 +############################################################################## +# Copyright (c) 2018 Intel Corporation +# All rights reserved. This program and the accompanying materials +# are made available under the terms of the Apache License, Version 2.0 +# which accompanies this distribution, and is available at +# http://www.apache.org/licenses/LICENSE-2.0 +############################################################################## GOPATH := $(shell realpath "$(PWD)/../../") DEPENDENCIES := github.com/golang/dep/cmd/dep @@ -21,7 +19,6 @@ all: clean dep CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -buildmode=plugin -a -tags netgo -o ./deployment.so ./plugins/deployment/plugin.go CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -buildmode=plugin -a -tags netgo -o ./namespace.so ./plugins/namespace/plugin.go CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -buildmode=plugin -a -tags netgo -o ./service.so ./plugins/service/plugin.go - CGO_ENABLED=1 GOOS=linux GOARCH=amd64 go build -a -tags netgo -o ./k8plugin ./cmd/main.go # The following is done this way as each patch on CI runs build and each merge runs deploy. So for build we don't need to build binary and hence @@ -32,6 +29,7 @@ build: clean dep plugins tests deploy: build tests: + go build -buildmode=plugin -o ./mock_files/mock_plugins/mockplugin.so ./mock_files/mock_plugins/mockplugin.go go test -v ./... -cover format: @@ -41,7 +39,6 @@ plugins: go build -buildmode=plugin -o ./plugins/deployment/deployment.so ./plugins/deployment/plugin.go go build -buildmode=plugin -o ./plugins/namespace/namespace.so ./plugins/namespace/plugin.go go build -buildmode=plugin -o ./plugins/service/service.so ./plugins/service/plugin.go - go build -buildmode=plugin -o ./mock_files/mock_plugins/mockplugin.so ./mock_files/mock_plugins/mockplugin.go dep: go get -u $(DEPENDENCIES)