Skip to content

Commit f3a5a31

Browse files
committed
resolve temporary todos
1 parent 65aac7b commit f3a5a31

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

.kokoro/psm_interop_kokoro_lib.sh

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ readonly FORCE_TESTING_VERSION="${FORCE_TESTING_VERSION:-}"
3030
readonly FORCE_IMAGE_BUILD_PSM="${FORCE_IMAGE_BUILD:-0}"
3131

3232
# Docker
33-
# TODO(sergiitk): if can be removed when DOCKER_REGISTRY removed from buildscripts.
33+
# TODO(sergiitk): 'if' can be removed when DOCKER_REGISTRY removed from buildscripts.
3434
if [[ -z "${DOCKER_REGISTRY}" ]] ; then
3535
readonly DOCKER_REGISTRY="us-docker.pkg.dev"
3636
fi
@@ -59,15 +59,6 @@ psm::lb::setup() {
5959
# TESTS: Populated with tests in the test suite.
6060
#######################################
6161
psm::lb::get_tests() {
62-
# TODO(sergiitk): remove after debugging
63-
TESTS=(
64-
"app_net_test"
65-
"baseline_test"
66-
)
67-
return
68-
69-
70-
# TODO(sergiitk): load from env var?
7162
TESTS=(
7263
"affinity_test"
7364
"api_listener_test"
@@ -92,7 +83,7 @@ psm::lb::get_tests() {
9283
#######################################
9384
# Executes LB test case.
9485
# Globals:
95-
# TBD
86+
# PSM_TEST_FLAGS: The array with flags for the test
9687
# Arguments:
9788
# Test case name
9889
# Outputs:
@@ -122,7 +113,6 @@ psm::security::setup() {
122113
# TESTS: Populated with tests in PSM Security test suite.
123114
#######################################
124115
psm::security::get_tests() {
125-
# TODO(sergiitk): load from env var?
126116
TESTS=(
127117
"baseline_test"
128118
"security_test"
@@ -133,7 +123,8 @@ psm::security::get_tests() {
133123
#######################################
134124
# Executes Security test case
135125
# Globals:
136-
# TBD
126+
# PSM_TEST_FLAGS: The array with flags for the test
127+
# GRPC_LANGUAGE: The name of gRPC languages under test
137128
# Arguments:
138129
# Test case name
139130
# Outputs:
@@ -175,7 +166,7 @@ psm::url_map::get_tests() {
175166
#######################################
176167
# Executes URL Map test case
177168
# Globals:
178-
# TBD
169+
# PSM_TEST_FLAGS: The array with flags for the test
179170
# Arguments:
180171
# Test case name
181172
# Outputs:
@@ -208,7 +199,6 @@ psm::csm::setup() {
208199
# TESTS: Populated with tests in the test suite.
209200
#######################################
210201
psm::csm::get_tests() {
211-
# TODO(sergiitk): load from env var?
212202
TESTS=(
213203
"gamma.gamma_baseline_test"
214204
"gamma.affinity_test"
@@ -221,7 +211,7 @@ psm::csm::get_tests() {
221211
#######################################
222212
# Executes CSM test case
223213
# Globals:
224-
# TBD
214+
# PSM_TEST_FLAGS: The array with flags for the test
225215
# Arguments:
226216
# Test case name
227217
# Outputs:
@@ -240,7 +230,11 @@ psm::csm::run_test() {
240230
# --- Common test run logic -----------
241231

242232
#######################################
243-
# TBD
233+
# Prepares and runs the test suite.
234+
#
235+
# Main entry function to be used by the buildscripts.
236+
# Provisions necessary software, configures the test driver, and executes the test suite.
237+
#
244238
# Globals:
245239
# KOKORO_ARTIFACTS_DIR
246240
# GITHUB_REPOSITORY_NAME
@@ -281,13 +275,14 @@ psm::run() {
281275
}
282276

283277
#######################################
284-
# Executes the test suite
278+
# Executes tests in the test suite
285279
# Globals:
286-
# TBD
280+
# TEST_DRIVER_FULL_DIR
281+
# TESTS: the list of the tests to execute
287282
# Arguments:
288-
# Test suite name
283+
# Test suite name.
289284
# Outputs:
290-
# TBD
285+
# Each test to stdout.
291286
#######################################
292287
psm::run::test_suite() {
293288
local test_suite="${1:?${FUNCNAME[0]} missing the test suite argument}"
@@ -302,7 +297,7 @@ psm::run::test_suite() {
302297
}
303298

304299
#######################################
305-
# Executes the test case
300+
# Executes a single test case of given test suite.
306301
# Globals:
307302
# TEST_DRIVER_FLAGFILE: Relative path to test driver flagfile
308303
# KUBE_CONTEXT: The name of kubectl context with GKE cluster access
@@ -362,7 +357,12 @@ psm::setup::generic_test_suite() {
362357
"psm::${test_suite}::setup"
363358
psm::setup::test_driver
364359
psm::build::docker_images_if_needed
360+
psm::setup::get_tests "${test_suite}"
361+
}
365362

363+
psm::setup::get_tests() {
364+
local test_suite="${1:?${FUNCNAME[0]} missing the test suite argument}"
365+
# TODO(sergiitk): allow to override TESTS from an env var
366366
"psm::${test_suite}::get_tests"
367367
psm::tools::log "Tests in ${test_suite} test suite:"
368368
printf -- " - %s\n" "${TESTS[@]}"

0 commit comments

Comments
 (0)