github: testing action workflow improvements and update to test Go1.16 (#4358)

.github/workflows/testing.yml

@@ -37,71 +37,77 @@ jobs:
     strategy:
       matrix:
         include:
-          - type: vet
-            goversion: 1.15
-          - type: race
-            goversion: 1.15
-          - type: 386
-            goversion: 1.15
-          - type: retry
-            goversion: 1.15
+          - type: vet+tests
+            goversion: 1.16
+
+          - type: tests
+            goversion: 1.16
+            testflags: -race
+
+          - type: tests
+            goversion: 1.16
+            grpcenv: GRPC_GO_RETRY=on
+
           - type: extras
+            goversion: 1.16
+
+          - type: tests
+            goversion: 1.16
+            goarch: 386
+
+          - type: tests
+            goversion: 1.16
+            goarch: arm64
+
+          - type: tests
             goversion: 1.15
+
           - type: tests
             goversion: 1.14
-          - type: tests
-            goversion: 1.13
-          - type: tests111
-            goversion: 1.11  # Keep until interop tests no longer require Go1.11
-          - type: arm64
-            goversion: 1.15
+
+          - type: tests  # Keep until interop tests no longer require Go1.11
+            goversion: 1.11
 
     steps:
       # Setup the environment.
-      - name: Setup GOARCH=386
-        if: ${{ matrix.type == '386' }}
-        run: echo "GOARCH=386" >> $GITHUB_ENV
-      - name: Setup GOARCH=arm64
-        if: ${{ matrix.type == 'arm64' }}
-        run: echo "GOARCH=arm64" >> $GITHUB_ENV
+      - name: Setup GOARCH
+        if: matrix.goarch != ''
+        run: echo "GOARCH=${{ matrix.goarch }}" >> $GITHUB_ENV
+
       - name: Setup qemu emulator
-        if: ${{ matrix.type == 'arm64' }}
+        if: matrix.goarch == 'arm64'
         # setup qemu-user-static emulator and register it with binfmt_misc so that aarch64 binaries
         # are automatically executed using qemu.
         run: docker run --rm --privileged multiarch/qemu-user-static:5.2.0-2 --reset --credential yes --persistent yes
-      - name: Setup RETRY
-        if: ${{ matrix.type == 'retry' }}
-        run: echo "GRPC_GO_RETRY=on" >> $GITHUB_ENV
+
+      - name: Setup GRPC environment
+        if: matrix.grpcenv != ''
+        run: echo "${{ matrix.grpcenv }}" >> $GITHUB_ENV
+
       - name: Setup Go
         uses: actions/setup-go@v2
         with:
           go-version: ${{ matrix.goversion }}
+
       - name: Checkout repo
         uses: actions/checkout@v2
 
       # Only run vet for 'vet' runs.
       - name: Run vet.sh
-        if: ${{ matrix.type == 'vet' }}
+        if: startsWith(matrix.type, 'vet')
         run: ./vet.sh -install && ./vet.sh
 
-      # Main tests run for everything except when testing "extras", the race
-      # detector and Go1.11 (where we run a reduced set of tests).
+      # Main tests run for everything except when testing "extras"
+      # (where we run a reduced set of tests).
       - name: Run tests
-        if: ${{ matrix.type != 'extras' && matrix.type != 'race' && matrix.type != 'tests111' }}
+        if: contains(matrix.type, 'tests')
         run: |
           go version
-          go test -cpu 1,4 -timeout 7m google.golang.org/grpc/...
-
-      # Race detector tests
-      - name: Run test race
-        if: ${{ matrix.TYPE == 'race' }}
-        run: |
-          go version
-          go test -race -cpu 1,4 -timeout 7m google.golang.org/grpc/...
+          go test ${{ matrix.testflags }} -cpu 1,4 -timeout 7m google.golang.org/grpc/...
 
       # Non-core gRPC tests (examples, interop, etc)
       - name: Run extras tests
-        if: ${{ matrix.TYPE == 'extras' }}
+        if: matrix.type == 'extras'
         run: |
           go version
           examples/examples_test.sh
@@ -109,12 +115,3 @@ jobs:
           interop/interop_test.sh
           cd ${GITHUB_WORKSPACE}/security/advancedtls && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/advancedtls/...
           cd ${GITHUB_WORKSPACE}/security/authorization && go test -cpu 1,4 -timeout 7m google.golang.org/grpc/security/authorization/...
-
-      # Reduced set of tests for Go 1.11
-      - name: Run Go1.11 tests
-        if: ${{ matrix.type == 'tests111' }}
-        run: |
-          go version
-          tests=$(find ${GITHUB_WORKSPACE} -name '*_test.go' | xargs -n1 dirname | sort -u | sed "s:^${GITHUB_WORKSPACE}:.:" | sed "s:\/$::" | grep -v ^./security | grep -v ^./credentials/sts | grep -v ^./credentials/tls/certprovider | grep -v ^./credentials/xds | grep -v ^./xds )
-          echo "Running tests for " ${tests}
-          go test -cpu 1,4 -timeout 7m ${tests}

credentials/tls/certprovider/pemfile/builder_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

credentials/tls/certprovider/pemfile/watcher_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

credentials/xds/xds_client_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

credentials/xds/xds_server_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

security/advancedtls/advancedtls_integration_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

security/advancedtls/advancedtls_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

security/authorization/engine/engine_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  * Copyright 2020 gRPC authors.
  *

security/authorization/engine/util_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/csds/csds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2021 gRPC authors.

xds/googledirectpath/googlec2p_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2021 gRPC authors.

xds/googledirectpath/utils.go

@@ -41,7 +41,7 @@ func getFromMetadata(timeout time.Duration, urlStr string) ([]byte, error) {
 	}
 	resp, err := client.Do(req)
 	if err != nil {
-		return nil, fmt.Errorf("failed communicating with metadata server: %w", err)
+		return nil, fmt.Errorf("failed communicating with metadata server: %v", err)
 	}
 	defer resp.Body.Close()
 	if resp.StatusCode != http.StatusOK {
@@ -49,7 +49,7 @@ func getFromMetadata(timeout time.Duration, urlStr string) ([]byte, error) {
 	}
 	body, err := ioutil.ReadAll(resp.Body)
 	if err != nil {
-		return nil, fmt.Errorf("failed reading from metadata server: %w", err)
+		return nil, fmt.Errorf("failed reading from metadata server: %v", err)
 	}
 	return body, nil
 }

xds/internal/balancer/balancergroup/balancergroup_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  * Copyright 2019 gRPC authors.
  *

xds/internal/balancer/balancergroup/testutils_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/balancer/cdsbalancer/cdsbalancer_security_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  * Copyright 2020 gRPC authors.
  *

xds/internal/balancer/cdsbalancer/cdsbalancer_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  * Copyright 2019 gRPC authors.
  *

xds/internal/balancer/clusterimpl/balancer_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/balancer/clusterimpl/config_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/balancer/clustermanager/clustermanager_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/balancer/clustermanager/config_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/balancer/edsbalancer/eds_impl_priority_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/balancer/edsbalancer/eds_impl_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  * Copyright 2019 gRPC authors.
  *

xds/internal/balancer/edsbalancer/eds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/balancer/edsbalancer/util_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  * Copyright 2019 gRPC authors.
  *

xds/internal/balancer/edsbalancer/xds_lrs_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/balancer/lrs/balancer_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/balancer/lrs/config_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/balancer/orca/orca_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  * Copyright 2019 gRPC authors.
  *

xds/internal/balancer/priority/balancer_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2021 gRPC authors.

xds/internal/balancer/priority/config_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/balancer/priority/utils_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2021 gRPC authors.

xds/internal/balancer/weightedtarget/weightedtarget_config_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/balancer/weightedtarget/weightedtarget_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/bootstrap/bootstrap_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/client/cds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/client_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/client/eds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/filter_chain_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2021 gRPC authors.

xds/internal/client/lds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/load/store_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/rds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/requests_counter_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/tests/client_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/tests/dump_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2021 gRPC authors.

xds/internal/client/tests/loadreport_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/v2/ack_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/client/v2/cds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/client/v2/client_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/client/v2/eds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/client/v2/lds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/client/v2/rds_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/watchers_cluster_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/watchers_endpoints_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/watchers_listener_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/client/watchers_route_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/httpfilter/fault/fault_test.go

@@ -1,3 +1,4 @@
+// +build go1.12
 // +build !386
 
 /*

xds/internal/internal_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/resolver/matcher_header_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/resolver/matcher_path_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/resolver/matcher_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/resolver/serviceconfig_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/resolver/watch_service_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/internal/resolver/xds_resolver_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2019 gRPC authors.

xds/internal/server/listener_wrapper_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2021 gRPC authors.

xds/internal/test/xds_client_integration_test.go

@@ -1,3 +1,4 @@
+// +build go1.12
 // +build !386
 
 /*

xds/internal/test/xds_integration_test.go

@@ -1,3 +1,4 @@
+// +build go1.12
 // +build !386
 
 /*

xds/internal/test/xds_server_integration_test.go

@@ -1,3 +1,4 @@
+// +build go1.12
 // +build !386
 
 /*

xds/internal/testutils/balancer_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.

xds/server_test.go

@@ -1,3 +1,5 @@
+// +build go1.12
+
 /*
  *
  * Copyright 2020 gRPC authors.