From 4faaecdfc92e7bcda2398ed8eb140589b9339e5e Mon Sep 17 00:00:00 2001
From: Paulo Castello da Costa <6579971+paulosjca@users.noreply.github.com>
Date: Mon, 23 Aug 2021 03:50:31 -0700
Subject: [PATCH] Update xml file location and update go version to 1.17.
 (#27076)

* Add subdirectories to support change in https://github.com/grpc/test-infra/pull/218.
* Update go version in kokoro runners to go1.17.
---
 tools/internal_ci/linux/grpc_e2e_performance_gke.sh | 9 +++++----
 tools/internal_ci/linux/grpc_e2e_performance_v2.sh  | 8 ++++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
index 4f0f2656f07..a8e767813ff 100755
--- a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
@@ -58,8 +58,8 @@ WORKER_POOL_8CORE=workers-8core-ci
 WORKER_POOL_32CORE=workers-32core-ci
 
 # Update go version.
-TEST_INFRA_GOVERSION=go1.16.6
-go get "golang.org/dl/${TEST_INFRA_GOVERSION}"
+TEST_INFRA_GOVERSION=go1.17
+go install "golang.org/dl/${TEST_INFRA_GOVERSION}@latest"
 "${TEST_INFRA_GOVERSION}" download
 
 # Clone test-infra repository to one upper level directory than grpc.
@@ -112,8 +112,9 @@ time ../test-infra/bin/prepare_prebuilt_workers \
     -t "${UNIQUE_IDENTIFIER}" \
     -r "${ROOT_DIRECTORY_OF_DOCKERFILES}"
 
-# Create reports directory.
-mkdir -p runner
+# Create reports directories.
+mkdir -p "runner/${WORKER_POOL_8CORE}" "runner/${WORKER_POOL_32CORE}"
+
 
 # Run tests.
 time ../test-infra/bin/runner \
diff --git a/tools/internal_ci/linux/grpc_e2e_performance_v2.sh b/tools/internal_ci/linux/grpc_e2e_performance_v2.sh
index 882f4a3bd4c..b1b57588a2d 100755
--- a/tools/internal_ci/linux/grpc_e2e_performance_v2.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_v2.sh
@@ -59,8 +59,8 @@ WORKER_POOL_8CORE=workers-8core-ci
 WORKER_POOL_32CORE=workers-32core-ci
 
 # Update go version.
-TEST_INFRA_GOVERSION=go1.16.6
-go get "golang.org/dl/${TEST_INFRA_GOVERSION}"
+TEST_INFRA_GOVERSION=go1.17
+go install "golang.org/dl/${TEST_INFRA_GOVERSION}@latest"
 "${TEST_INFRA_GOVERSION}" download
 
 # Clone test-infra repository to one upper level directory than grpc.
@@ -113,8 +113,8 @@ time ../test-infra/bin/prepare_prebuilt_workers \
     -t "${UNIQUE_IDENTIFIER}" \
     -r "${ROOT_DIRECTORY_OF_DOCKERFILES}"
 
-# Create reports directory.
-mkdir -p runner
+# Create reports directories.
+mkdir -p "runner/${WORKER_POOL_8CORE}" "runner/${WORKER_POOL_32CORE}"
 
 # Run tests.
 time ../test-infra/bin/runner \