From 330da904921d33e0919024a1086b1bdb33805bec Mon Sep 17 00:00:00 2001
From: Matthew Sykes <sykesmat@us.ibm.com>
Date: Fri, 29 May 2020 15:14:58 -0400
Subject: [PATCH] Remove s390x, powerpc64le from RELEASE_PLATFORMS

- Release automation only creates amd64 binaries for darwin, linux, and
  windows.
- Continuous integration no longer runs on powerpc64le or s390x

Also remove stale build tags related to plugins and race detection for
old versions of go, s390x, and ppc64le.

Signed-off-by: Matthew Sykes <sykesmat@us.ibm.com>
---
 Makefile                                      | 2 +-
 bccsp/pkcs11/impl.go                          | 8 ++------
 core/chaincode/platforms/golang/platform.go   | 1 -
 core/handlers/library/race_test.go            | 2 --
 core/handlers/library/registry_plugin_test.go | 3 ---
 scripts/run-unit-tests.sh                     | 5 -----
 6 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/Makefile b/Makefile
index a3b60f3fc65..8b83aa3cd2e 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ GO_TAGS ?=
 
 RELEASE_EXES = orderer $(TOOLS_EXES)
 RELEASE_IMAGES = baseos ccenv orderer peer tools
-RELEASE_PLATFORMS = darwin-amd64 linux-amd64 linux-ppc64le linux-s390x windows-amd64
+RELEASE_PLATFORMS = darwin-amd64 linux-amd64 windows-amd64
 TOOLS_EXES = configtxgen configtxlator cryptogen discover idemixgen peer
 
 pkgmap.configtxgen    := $(PKGNAME)/cmd/configtxgen
diff --git a/bccsp/pkcs11/impl.go b/bccsp/pkcs11/impl.go
index 519f20429c0..11a9c222276 100644
--- a/bccsp/pkcs11/impl.go
+++ b/bccsp/pkcs11/impl.go
@@ -226,17 +226,13 @@ func (csp *impl) Decrypt(k bccsp.Key, ciphertext []byte, opts bccsp.DecrypterOpt
 // This is a convenience function. Useful to self-configure, for tests where usual configuration is not
 // available
 func FindPKCS11Lib() (lib, pin, label string) {
-	//FIXME: Till we workout the configuration piece, look for the libraries in the familiar places
 	lib = os.Getenv("PKCS11_LIB")
 	if lib == "" {
 		pin = "98765432"
 		label = "ForFabric"
 		possibilities := []string{
-			"/usr/lib/softhsm/libsofthsm2.so",                            //Debian
-			"/usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so",           //Ubuntu
-			"/usr/lib/s390x-linux-gnu/softhsm/libsofthsm2.so",            //Ubuntu
-			"/usr/lib/powerpc64le-linux-gnu/softhsm/libsofthsm2.so",      //Power
-			"/usr/local/Cellar/softhsm/2.5.0/lib/softhsm/libsofthsm2.so", //MacOS
+			"/usr/lib/softhsm/libsofthsm2.so",                  //Debian
+			"/usr/lib/x86_64-linux-gnu/softhsm/libsofthsm2.so", //Ubuntu
 		}
 		for _, path := range possibilities {
 			if _, err := os.Stat(path); !os.IsNotExist(err) {
diff --git a/core/chaincode/platforms/golang/platform.go b/core/chaincode/platforms/golang/platform.go
index d3812f624f1..de9f417bdc5 100644
--- a/core/chaincode/platforms/golang/platform.go
+++ b/core/chaincode/platforms/golang/platform.go
@@ -490,7 +490,6 @@ func distributions() []dist {
 	// pre-populate linux architecutures
 	dists := map[dist]bool{
 		{goos: "linux", goarch: "amd64"}: true,
-		{goos: "linux", goarch: "s390x"}: true,
 	}
 
 	// add local OS and ARCH
diff --git a/core/handlers/library/race_test.go b/core/handlers/library/race_test.go
index dcaf8421286..dd12f0eab19 100644
--- a/core/handlers/library/race_test.go
+++ b/core/handlers/library/race_test.go
@@ -1,6 +1,4 @@
 // +build race
-// +build go1.9,linux,cgo go1.10,darwin,cgo
-// +build !ppc64le
 
 /*
 Copyright IBM Corp. All Rights Reserved.
diff --git a/core/handlers/library/registry_plugin_test.go b/core/handlers/library/registry_plugin_test.go
index 50f27502784..802ed440719 100644
--- a/core/handlers/library/registry_plugin_test.go
+++ b/core/handlers/library/registry_plugin_test.go
@@ -1,6 +1,3 @@
-// +build go1.9,linux,cgo go1.10,darwin,cgo
-// +build !ppc64le
-
 /*
 Copyright SecureKey Technologies Inc. All Rights Reserved.
 
diff --git a/scripts/run-unit-tests.sh b/scripts/run-unit-tests.sh
index 2dba8795626..2f2f3eb1a4d 100755
--- a/scripts/run-unit-tests.sh
+++ b/scripts/run-unit-tests.sh
@@ -171,11 +171,6 @@ run_tests_with_coverage() {
 }
 
 main() {
-    # explicit exclusions for ppc and s390x
-    if [ "$(uname -m)" == "ppc64le" ] || [ "$(uname -m)" == "s390x" ]; then
-        excluded_packages+=("github.com/hyperledger/fabric/core/chaincode/platforms/java")
-    fi
-
     # default behavior is to run all tests
     local -a package_spec=("${TEST_PKGS:-github.com/hyperledger/fabric/...}")