From ab184f1087973a6de4e90c27cd5657f2ce0afc06 Mon Sep 17 00:00:00 2001
From: Christopher Ferris <chrisfer@us.ibm.com>
Date: Wed, 19 Sep 2018 15:41:42 -0400
Subject: [PATCH] FABC-722 remove default hybrid image generation

normal build has a hard dependency on the fabric
images being published. This creatses a serialization
issue for the release process requiring fabric to be fully
released and published before the fabric-ca release can
begin to be processed in CI.

remove fabric-ca-peer, fabric-ca-orderer, fabric-ca-tools
from build dependency. Add new docker-all target to build
those images and fabric-ca for fabric-samples/fabric-ca
example tutorial.

Change-Id: Ie30829f5b53b5870d07fa8b231885911df8fe87a
Signed-off-by: Christopher Ferris <chrisfer@us.ibm.com>
---
 .gitignore           |  3 +++
 Makefile             | 18 ++++++++++++------
 scripts/multiarch.sh |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 02b11ea14..87f85eb02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
 bin
 build
 coverage.xml
+results.txt
+profile.cov
+report.xml
 *.csr
 *.der
 testdata/fabric-ca-cert.pem
diff --git a/Makefile b/Makefile
index e934d0d2d..c7bdf5ab5 100644
--- a/Makefile
+++ b/Makefile
@@ -40,7 +40,7 @@ STABLE_TAG ?= $(ARCH)-$(BASE_VERSION)-stable
 ifneq ($(IS_RELEASE),true)
 EXTRA_VERSION ?= snapshot-$(shell git rev-parse --short HEAD)
 PROJECT_VERSION=$(BASE_VERSION)-$(EXTRA_VERSION)
-FABRIC_TAG ?= $(ARCH)-latest
+FABRIC_TAG ?= latest
 else
 PROJECT_VERSION=$(BASE_VERSION)
 FABRIC_TAG ?= $(ARCH)-$(BASE_VERSION)
@@ -61,7 +61,9 @@ GO_SOURCE := $(shell find . -name '*.go')
 GO_LDFLAGS = $(patsubst %,-X $(PKGNAME)/lib/metadata.%,$(METADATA_VAR))
 export GO_LDFLAGS
 
-IMAGES = $(PROJECT_NAME) $(PROJECT_NAME)-orderer $(PROJECT_NAME)-peer $(PROJECT_NAME)-tools
+IMAGES_ALL = $(PROJECT_NAME) $(PROJECT_NAME)-orderer $(PROJECT_NAME)-peer $(PROJECT_NAME)-tools
+
+IMAGES = $(PROJECT_NAME)
 FVTIMAGE = $(PROJECT_NAME)-fvt
 
 RELEASE_PLATFORMS = linux-amd64 darwin-amd64 linux-ppc64le linux-s390x windows-amd64
@@ -79,6 +81,8 @@ rename: .FORCE
 
 docker: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES))
 
+docker-all: $(patsubst %,build/image/%/$(DUMMY), $(IMAGES_ALL))
+
 docker-fabric-ca: build/image/fabric-ca/$(DUMMY)
 
 docker-fvt: $(patsubst %,build/image/%/$(DUMMY), $(FVTIMAGE))
@@ -153,11 +157,11 @@ build/image/fabric-ca-fvt/payload: \
 	build/docker/bin/fabric-ca-server \
 	build/fabric-ca-fvt.tar.bz2
 build/image/fabric-ca-orderer/payload: \
-	build/docker/bin/fabric-ca-client
+        build/docker/bin/fabric-ca-client
 build/image/fabric-ca-peer/payload: \
-	build/docker/bin/fabric-ca-client
+        build/docker/bin/fabric-ca-client
 build/image/fabric-ca-tools/payload: \
-	build/docker/bin/fabric-ca-client
+        build/docker/bin/fabric-ca-client
 build/image/%/payload:
 	@echo "Copying $^ to $@"
 	mkdir -p $@
@@ -178,6 +182,8 @@ all-tests: checks fabric-ca-server fabric-ca-client
 unit-tests: checks fabric-ca-server fabric-ca-client
 	@scripts/run_unit_tests
 
+unit-test: unit-tests
+
 int-tests: checks fabric-ca-server fabric-ca-client
 	@scripts/run_integration_tests
 
@@ -229,7 +235,7 @@ ci-tests: docker-clean docker-fvt all-tests docs
 	-docker images -q $(NEXUS_URL)/*:$(STABLE_TAG) | xargs -I '{}' docker rmi -f '{}'
 	-@rm -rf build/image/$(TARGET) ||:
 
-docker-clean: $(patsubst %,%-docker-clean, $(IMAGES) $(PROJECT_NAME)-fvt)
+docker-clean: $(patsubst %,%-docker-clean, $(IMAGES_ALL) $(PROJECT_NAME)-fvt)
 	@rm -rf build/docker/bin/* ||:
 
 native: fabric-ca-client fabric-ca-server
diff --git a/scripts/multiarch.sh b/scripts/multiarch.sh
index 961811df3..063848d35 100755
--- a/scripts/multiarch.sh
+++ b/scripts/multiarch.sh
@@ -46,7 +46,7 @@ if [ "$?" -ne 0 ]; then
   exit 1
 fi
 
-IMAGES="fabric-ca fabric-ca-tools fabric-ca-orderer fabric-ca-peer"
+IMAGES="fabric-ca"
 
 # check that all images have been published
 for image in ${IMAGES}; do