Merge pull request #4199 from fuweid/update-go-version-zuul

.zuul: update go version to 1.13.10

.zuul/playbooks/containerd-build/run.yaml

@@ -2,6 +2,7 @@
   become: yes
   roles:
   - role: config-golang
+    go_version: '1.13.10'
     arch: arm64
   tasks:
   - name: Build containerd
@@ -12,6 +13,7 @@
         apt-get update
         apt-get install -y btrfs-tools libseccomp-dev git pkg-config
 
+        go version
         make | tee $LOGS_PATH/make.txt
         make test | tee $LOGS_PATH/make_test.txt
 

runtime/v2/shim/shim_test.go

@@ -24,11 +24,14 @@ import (
 )
 
 func TestRuntimeWithEmptyMaxEnvProcs(t *testing.T) {
+	var oldGoMaxProcs = runtime.GOMAXPROCS(0)
+	defer runtime.GOMAXPROCS(oldGoMaxProcs)
 
 	os.Setenv("GOMAXPROCS", "")
 	setRuntime()
-	var oldGoMaxProcs = runtime.GOMAXPROCS(0)
-	if oldGoMaxProcs != 2 {
+
+	var currentGoMaxProcs = runtime.GOMAXPROCS(0)
+	if currentGoMaxProcs != 2 {
 		t.Fatal("the max number of procs should be 2")
 	}
 }