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

.zuul: update go version to 1.13.10

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

@@ -1,21 +1,23 @@
 - hosts: all
   become: yes
   roles:
-    - role: config-golang
+  - role: config-golang
-      arch: arm64
+    go_version: '1.13.10'
+    arch: arm64
   tasks:
-    - name: Build containerd
+  - name: Build containerd
-      shell:
+    shell:
-        cmd: |
+      cmd: |
-          set -xe
+        set -xe
-          set -o pipefail
+        set -o pipefail
-          apt-get update
+        apt-get update
-          apt-get install -y btrfs-tools libseccomp-dev git pkg-config
+        apt-get install -y btrfs-tools libseccomp-dev git pkg-config
 
-          make | tee $LOGS_PATH/make.txt
+        go version
-          make test | tee $LOGS_PATH/make_test.txt
+        make | tee $LOGS_PATH/make.txt
+        make test | tee $LOGS_PATH/make_test.txt
 
-          cp -r ./bin $RESULTS_PATH
+        cp -r ./bin $RESULTS_PATH
-        chdir: '{{ zuul.project.src_dir }}'
+      chdir: '{{ zuul.project.src_dir }}'
-        executable: /bin/bash
+      executable: /bin/bash
-      environment: '{{ global_env }}'
+    environment: '{{ global_env }}'

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")
 	}
 }