Skip to content

Update the version logic and tagging #268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pawbhard merged 4 commits into from
Jul 22, 2026
+42 −1
Merged

Update the version logic and tagging #268

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d29fa7
Tag fix
pawbhard Jul 21, 2026
47b76aa
rc
pawbhard Jul 21, 2026
6926728
Review comments
pawbhard Jul 21, 2026
64e7f9b
review
pawbhard Jul 22, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion .kokoro/psm_interop_kokoro_lib.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -822,6 +822,18 @@ psm::build::docker_images_if_needed() {
} |& tee -a "${BUILD_LOGS_ROOT}/build-docker.log"
else
psm::tools::log "Skipping ${GRPC_LANGUAGE} test app build"
# Image exists but version is not correctly tag
# Tag the version
Comment thread
pawbhard marked this conversation as resolved.
Outdated
if is_version_branch "${TESTING_VERSION}"; then
if [[ "${client_tags}" != *"${TESTING_VERSION}"* ]]; then
Comment thread
sergiitk marked this conversation as resolved.
Outdated
psm::tools::log "Adding version tag ${TESTING_VERSION} to existing client image ${CLIENT_IMAGE_NAME}:${GIT_COMMIT}"
psm::tools::run_verbose gcloud -q container images add-tag "${CLIENT_IMAGE_NAME}:${GIT_COMMIT}" "${CLIENT_IMAGE_NAME}:${TESTING_VERSION}"
fi
if [[ -z "${SERVER_IMAGE_USE_CANONICAL}" && "${server_tags}" != *"${TESTING_VERSION}"* ]]; then
psm::tools::log "Adding version tag ${TESTING_VERSION} to existing server image ${SERVER_IMAGE_NAME}:${GIT_COMMIT}"
psm::tools::run_verbose gcloud -q container images add-tag "${SERVER_IMAGE_NAME}:${GIT_COMMIT}" "${SERVER_IMAGE_NAME}:${TESTING_VERSION}"
Comment thread
sergiitk marked this conversation as resolved.
Outdated
fi
fi
fi
}

Expand Down Expand Up @@ -1351,7 +1363,7 @@ kokoro_get_testing_version() {
# Allows to override the testing version, and force tagging the built
# images, if necessary.
readonly TESTING_VERSION="${PSM_FORCE_TESTING_VERSION}"
elif [[ "${KOKORO_BUILD_INITIATOR:-anonymous}" != "kokoro" ]]; then
elif [[ "${KOKORO_BUILD_INITIATOR:-anonymous}" != kokoro* ]]; then
Comment thread
pawbhard marked this conversation as resolved.
# If not initiated by Kokoro, it's a dev branch.
# This allows to know later down the line that the built image doesn't need
# to be tagged, and avoid overriding an actual versioned image used in tests
Expand Down
Loading