Run ci with go 1.13.15

Signed-off-by: Swetha Repakula <[email protected]>

Author: swetharepakula

Makefile

@@ -55,7 +55,7 @@ gotools: gotools-install
 unit-test: gotool.ginkgo
 	@echo "Running unit-tests"
 	ginkgo -p -randomizeAllSpecs -randomizeSuites -requireSuite -noColor -keepGoing -race -r evmcc
-	cd fab3 && GO111MODULE=on ginkgo -p -randomizeAllSpecs -randomizeSuites -requireSuite -noColor -keepGoing -race -r
+	cd fab3 && ginkgo -p -randomizeAllSpecs -randomizeSuites -requireSuite -noColor -keepGoing -race -r
 
 unit-tests: unit-test
 
@@ -81,6 +81,7 @@ docker-images:
 	done
 	@docker inspect hyperledger/fabric-javaenv:amd64-latest --format ' ' || \
 		echo "tag javaenv" && docker tag busybox hyperledger/fabric-javaenv:amd64-latest
+	docker pull hyperledger/fabric-ccenv:1.4 && docker tag hyperledger/fabric-ccenv:1.4 hyperledger/fabric-ccenv:amd64-latest
 
 .PHONY: integration-test
 integration-test: docker-images gotool.ginkgo

ci/azure-pipelines.yml

@@ -11,7 +11,7 @@ pr:
 variables:
   GOPATH: $(Agent.BuildDirectory)/go
   PATH: $(Agent.BuildDirectory)/go/bin:/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin
-  GO_VER: 1.11.13
+  GO_VER: 1.13.15
   NODE_VER: 8.11.3
 
 jobs:

evmcc/go.mod

@@ -23,6 +23,7 @@ require (
 	github.com/tmthrgd/go-hex v0.0.0-20190904060850-447a3041c3bc // indirect
 	golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550
 	golang.org/x/sys v0.0.0-20191020212454-3e7259c5e7c2 // indirect
-	google.golang.org/appengine v1.4.0 // indirect
 	google.golang.org/grpc v1.24.0 // indirect
 )
+
+go 1.13

fab3/go.mod

@@ -26,3 +26,5 @@ require (
 replace github.com/hyperledger/fabric-chaincode-evm/evmcc => ../evmcc
 
 replace github.com/go-kit/kit => github.com/go-kit/kit v0.8.0
+
+go 1.13

gotools.mk

@@ -8,7 +8,6 @@ BUILD_DIR ?= .build
 GOTOOLS_GOPATH ?= $(BUILD_DIR)/gotools
 GOTOOLS_BINDIR ?= $(firstword $(subst :, ,$(GOPATH)))/bin
 GOROOT ?= $(firstword $(subst :, ,$(GOPATH))
-GO111MODULE=off
 
 # go tool->path mapping
 go.fqp.counterfeiter := github.com/maxbrunsfeld/counterfeiter
@@ -23,16 +22,16 @@ gotools-clean:
 	-@rm -rf $(BUILD_DIR)/gotools
 
 # Special override for ginkgo since we want to use the version vendored with the project
-gotool.ginkgo: GINKGO_VERSION ?= "v1.10.2"
+gotool.ginkgo: GINKGO_VERSION ?= "v1.11.0"
 gotool.ginkgo:
 	@GOPATH=$(abspath $(GOTOOLS_GOPATH)) go get -d -u github.com/onsi/ginkgo
 	@git -C $(abspath $(GOTOOLS_GOPATH))/src/github.com/onsi/ginkgo checkout -q $(GINKGO_VERSION)
 	@echo "Building github.com/onsi/ginkgo/ginkgo $(GINKGO_VERSION)-> ginkgo"
-	@GOPATH=$(abspath $(GOTOOLS_GOPATH)) GOBIN=$(abspath $(GOTOOLS_BINDIR)) go install -ldflags="-X main.version=$(GINKGO_VERSION) -X main.buildDate=$$(date '+%Y-%m-%d')" github.com/onsi/ginkgo/ginkgo
+	@GOPATH=$(abspath $(GOTOOLS_GOPATH)) GOBIN=$(abspath $(GOTOOLS_BINDIR)) GO111MODULE=on go install -ldflags="-X main.version=$(GINKGO_VERSION) -X main.buildDate=$$(date '+%Y-%m-%d')" github.com/onsi/ginkgo/ginkgo
 # reset to a branch, so that the next time this target is run, go get starts on a branch, as it must
 	@git -C $(abspath $(GOTOOLS_GOPATH))/src/github.com/onsi/ginkgo/ checkout -q master
 
-gotool.counterfeiter: COUNTERFEITER_VERSION ?= "v6.0.1"
+gotool.counterfeiter: COUNTERFEITER_VERSION ?= "v6.3.0"
 gotool.counterfeiter:
 	@GOPATH=$(abspath $(GOTOOLS_GOPATH)) go get -d -u ${go.fqp.counterfeiter}
 	@git -C $(abspath $(GOTOOLS_GOPATH))/src/${go.fqp.counterfeiter} checkout -q $(COUNTERFEITER_VERSION)

scripts/run-integration-tests.sh

@@ -48,11 +48,6 @@ main() {
         fi
     fi
 
-    echo "Building CCENV image"
-    pushd ${FABRIC_DIR}
-        make ccenv CHAINTOOL_URL='https://hyperledger.jfrog.io/hyperledger/fabric-maven/org/hyperledger/fabric-chaintool/$(CHAINTOOL_RELEASE)/fabric-chaintool-$(CHAINTOOL_RELEASE).jar'
-    popd
-
     echo "Running integration tests..."
     ginkgo -noColor -randomizeAllSpecs -race -keepGoing --slowSpecThreshold 80 -r "${dirs[@]}"
 }