[FAB-8706] Provide defaults for build metadata

Enables some tests that require non-default metadata to run outside of
the full build process with link flags.

Change-Id: Iaadadccf3ef7cbc630801ec612c481f11629c29e
Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com>
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

Author: sykesm

Makefile

@@ -197,7 +197,7 @@ profile: unit-test-clean peer-docker testenv
 
 # Generates a string to the terminal suitable for manual augmentation / re-issue, useful for running tests by hand
 test-cmd:
-	@echo "go test -tags \"$(GO_TAGS)\" -ldflags \"$(GO_LDFLAGS)\""
+	@echo "go test -tags \"$(GO_TAGS)\"
 
 docker: docker-thirdparty $(patsubst %,build/image/%/$(DUMMY), $(IMAGES))
 
@@ -305,6 +305,7 @@ build/image/%/$(DUMMY): Makefile build/image/%/payload build/image/%/Dockerfile
 	@echo "Building docker $(TARGET)-image"
 	$(DBUILD) -t $(DOCKER_NS)/fabric-$(TARGET) $(@D)
 	docker tag $(DOCKER_NS)/fabric-$(TARGET) $(DOCKER_NS)/fabric-$(TARGET):$(DOCKER_TAG)
+	docker tag $(DOCKER_NS)/fabric-$(TARGET) $(DOCKER_NS)/fabric-$(TARGET):$(ARCH)-latest
 	@touch $@
 
 build/gotools.tar.bz2: build/docker/gotools

common/metadata/metadata.go

@@ -1,25 +1,15 @@
 /*
 Copyright London Stock Exchange 2016 All Rights Reserved.
 
-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
 */
 
 package metadata
 
 // Variables defined by the Makefile and passed in with ldflags
-var Version string
-var BaseVersion string
-var BaseDockerLabel string
-var DockerNamespace string
-var BaseDockerNamespace string
-var Experimental string
+var Version string = "latest"
+var BaseVersion string = "0.4.6"
+var BaseDockerLabel string = "org.hyperledger.fabric"
+var DockerNamespace string = "hyperledger"
+var BaseDockerNamespace string = "hyperledger"
+var Experimental string = "true"

unit-test/docker-compose.yml

@@ -8,7 +8,6 @@ unit-tests:
   links:
     - couchdb
   environment:
-    - GO_LDFLAGS
     - GO_TAGS
     - OUTPUT
     - TEST_PKGS=${TEST_PKGS}

unit-test/run.sh

@@ -57,7 +57,7 @@ run_tests() {
 
     local parallel="$@"
     if [ -n "${parallel}" ]; then
-        time go test ${flags} -tags "$GO_TAGS" -ldflags "$GO_LDFLAGS" ${parallel[@]} -short -timeout=20m
+        time go test ${flags} -tags "$GO_TAGS" ${parallel[@]} -short -timeout=20m
     fi
 }
 
@@ -67,7 +67,7 @@ run_tests_with_coverage() {
     # Initialize profile.cov
     for pkg in $@; do
         :> profile_tmp.cov
-        go test -cover -coverprofile=profile_tmp.cov -tags "$GO_TAGS" -ldflags "$GO_LDFLAGS" $pkg -timeout=20m
+        go test -cover -coverprofile=profile_tmp.cov -tags "$GO_TAGS" $pkg -timeout=20m
         tail -n +2 profile_tmp.cov >> profile.cov || echo "Unable to append coverage for $pkg"
     done