Normalize load test prefixes, and update go version to go1.17.1. (#27351)
* Set the prefix to a constant value for test runs initiated by users with names that start with `kokoro`. Prefixes for master and experimental jobs are `kokoro` and `kokoro-test` respectively. This compensates for the fact that scheduled runs are initiated by `kokoro`, but CI runs are initated by `kokoro-github-subscriber`.
* Update the go version to be used for each run from go1.17 to go1.17.1.
diff --git a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
index 1998567..6302cf2 100755
--- a/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_gke.sh
@@ -32,6 +32,9 @@
# Set up environment variables.
LOAD_TEST_PREFIX="${KOKORO_BUILD_INITIATOR}"
# BEGIN differentiate experimental configuration from master configuration.
+if [[ "${KOKORO_BUILD_INITIATOR%%-*}" == kokoro ]]; then
+ LOAD_TEST_PREFIX=kokoro
+fi
# Use the "official" BQ tables so that the measurements will show up in the
# "official" public dashboard.
BIGQUERY_TABLE_8CORE=e2e_benchmarks.ci_master_results_8core
@@ -57,7 +60,7 @@
WORKER_POOL_32CORE=workers-32core-ci
# Update go version.
-TEST_INFRA_GOVERSION=go1.17
+TEST_INFRA_GOVERSION=go1.17.1
go get "golang.org/dl/${TEST_INFRA_GOVERSION}"
"${TEST_INFRA_GOVERSION}" download
diff --git a/tools/internal_ci/linux/grpc_e2e_performance_v2.sh b/tools/internal_ci/linux/grpc_e2e_performance_v2.sh
index ed0089a..d4c8fc1 100755
--- a/tools/internal_ci/linux/grpc_e2e_performance_v2.sh
+++ b/tools/internal_ci/linux/grpc_e2e_performance_v2.sh
@@ -32,7 +32,7 @@
# Set up environment variables.
LOAD_TEST_PREFIX="${KOKORO_BUILD_INITIATOR}"
# BEGIN differentiate experimental configuration from master configuration.
-if [[ "${KOKORO_BUILD_INITIATOR}" == kokoro ]]; then
+if [[ "${KOKORO_BUILD_INITIATOR%%-*}" == kokoro ]]; then
LOAD_TEST_PREFIX=kokoro-test
fi
BIGQUERY_TABLE_8CORE=e2e_benchmarks.experimental_results
@@ -58,7 +58,7 @@
WORKER_POOL_32CORE=workers-32core-ci
# Update go version.
-TEST_INFRA_GOVERSION=go1.17
+TEST_INFRA_GOVERSION=go1.17.1
go get "golang.org/dl/${TEST_INFRA_GOVERSION}"
"${TEST_INFRA_GOVERSION}" download
