Int. test to use ccenv-1.4 image to build cc

With the removal of the shim from ccenv-2.0, chaincode packaged for
previous releases can't be built by a 2.0 peer using ccenv-2.0. This
CR adds a test to ensure that a 2.0 peer can be configured to use
ccenv-1.4 as the builder image.

FAB-16721 #done

Change-Id: I335f78aeacf08ce0145803173ee392c5323ce7b8
Signed-off-by: Will Lahti <wtlahti@us.ibm.com>

Author: wlahti

Makefile

@@ -148,13 +148,16 @@ unit-test: unit-test-clean docker-thirdparty ccenv-docker baseos-docker
 unit-tests: unit-test
 
 # Pull thirdparty docker images based on the latest baseimage release version
+# Also pull ccenv-1.4 for compatibility test to ensure pre-2.0 installed chaincodes
+# can be built by a peer configured to use the ccenv-1.4 as the builder image.
 .PHONY: docker-thirdparty
 docker-thirdparty:
 	docker pull couchdb:${COUCHDB_VER}
 	docker pull $(BASE_DOCKER_NS)/fabric-zookeeper:$(BASE_DOCKER_TAG)
 	docker tag $(BASE_DOCKER_NS)/fabric-zookeeper:$(BASE_DOCKER_TAG) $(DOCKER_NS)/fabric-zookeeper
 	docker pull $(BASE_DOCKER_NS)/fabric-kafka:$(BASE_DOCKER_TAG)
 	docker tag $(BASE_DOCKER_NS)/fabric-kafka:$(BASE_DOCKER_TAG) $(DOCKER_NS)/fabric-kafka
+	docker pull hyperledger/fabric-ccenv:1.4
 
 .PHONY: verify
 verify: export JOB_TYPE=VERIFY

integration/lifecycle/interop_test.go

@@ -802,4 +802,60 @@ var _ = Describe("Release interoperability", func() {
 			})
 		})
 	})
+
+	Describe("solo network using ccenv-1.4", func() {
+		var network *nwo.Network
+		var process ifrit.Process
+
+		BeforeEach(func() {
+			network = nwo.New(nwo.BasicSolo(), testDir, client, StartPort(), components)
+
+			// Generate config and bootstrap the network
+			network.GenerateConfigTree()
+
+			for _, peer := range network.PeersWithChannel("testchannel") {
+				core := network.ReadPeerConfig(peer)
+				core.Chaincode.Builder = "$(DOCKER_NS)/fabric-ccenv:1.4"
+				network.WritePeerConfig(peer, core)
+			}
+
+			network.Bootstrap()
+
+			// Start all of the fabric processes
+			networkRunner := network.NetworkGroupRunner()
+			process = ifrit.Invoke(networkRunner)
+			Eventually(process.Ready(), network.EventuallyTimeout).Should(BeClosed())
+		})
+
+		AfterEach(func() {
+			// Shutdown processes and cleanup
+			process.Signal(syscall.SIGTERM)
+			Eventually(process.Wait(), network.EventuallyTimeout).Should(Receive())
+			network.Cleanup()
+		})
+
+		It("deploys and executes chaincode (simple)", func() {
+			By("deploying the chaincode using LSCC on a channel with V1_4 application capabilities")
+			orderer := network.Orderer("orderer")
+			peer := network.Peer("Org1", "peer1")
+
+			cwd, err := os.Getwd()
+			Expect(err).NotTo(HaveOccurred())
+
+			// this chaincode was packaged using the v1.4.3 fabric-tools
+			// (image id: 18ed4db0cd57) and peer (image id: fa87ccaed0ef)
+			// images. It was packaged with name "mycc" and version "0.0".
+			chaincode := nwo.Chaincode{
+				Name:        "mycc",
+				Version:     "0.0",
+				PackageFile: filepath.Join(cwd, "testdata/mycc-0_0-v14.cds"),
+				Ctor:        `{"Args":["init","a","100","b","200"]}`,
+				Policy:      `AND ('Org1MSP.member','Org2MSP.member')`,
+			}
+
+			network.CreateAndJoinChannels(orderer)
+			nwo.DeployChaincodeLegacy(network, "testchannel", orderer, chaincode)
+			RunQueryInvokeQuery(network, orderer, peer, "mycc", 100)
+		})
+	})
 })

integration/lifecycle/testdata/mycc-0_0-v14.cds

@@ -107,8 +107,10 @@ func DeployChaincodeLegacy(n *Network, channel string, orderer *Orderer, chainco
 		chaincode.PackageFile = tempFile.Name()
 	}
 
-	// package using the first peer
-	PackageChaincodeLegacy(n, chaincode, peers[0])
+	// only create chaincode package if it doesn't already exist
+	if fi, err := os.Stat(chaincode.PackageFile); os.IsNotExist(err) || fi.Size() == 0 {
+		PackageChaincodeLegacy(n, chaincode, peers[0])
+	}
 
 	// install on all peers
 	InstallChaincodeLegacy(n, chaincode, peers...)