Skip to content

chore: avoid masking errors in docker validation script #689

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
merged 6 commits into from
Oct 17, 2023
Merged

chore: avoid masking errors in docker validation script #689

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
0b4950d
chore: avoid masking errors in docker validation script
mpeddada1 Oct 16, 2023
bd9ae47
add log messages for failure
mpeddada1 Oct 16, 2023
901bda0
print echo statements
mpeddada1 Oct 16, 2023
3810d79
undo test code
mpeddada1 Oct 16, 2023
f48fb2d
test removal of redundant check
mpeddada1 Oct 16, 2023
6629dc9
undo change
mpeddada1 Oct 16, 2023
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
8 changes: 7 additions & 1 deletion .kokoro/verify-docker-images.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,11 @@

# Script to verify the presence of GraalVM docker test images tagged with the latest java-shared-config version.

set -o pipefail

# Output commands executed.
set -x

function fetch_image_names() {
imageNames="$(grep " - gcr.io/cloud-devrel-public-resources/" .cloudbuild/cloudbuild.yaml | cut -d "/" -f 3 | cut -d ":" -f 1)"
export imageNames
Expand Down Expand Up @@ -30,9 +35,10 @@ if [[ "${branchName}" == *"release-please--branches--main"* ]] && [[ ! $gitCommi
gcloud container images describe "${fullContainerName}" > /dev/null; exit_status=$?
if [[ $exit_status = 0 ]]; then
echo "Success. Found $fullContainerName."
else
exit $exit_status
Comment on lines +38 to +39
Copy link
Member

@lqiu96 lqiu96 Oct 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Wouldn't set -o pipefail exit with the non-zero status code? I might be missing something, but Is this check needed?

Copy link
Contributor Author

@mpeddada1 mpeddada1 Oct 16, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good question! Just tried it out in f48fb2d but unfortunately, it looks like we still need the check otherwise the script results in an exit 0 even when the command results in an error:

ERROR: (gcloud.container.images.describe) [:latest] digest must be of the form "sha256:<digest>".
+ exit_status=1
cleanup

[ID: 8899040] Command finished after 23 secs, exit value: 0

fi
done
RETURN_CODE=$?
else
echo "Skipping check for non-release and SNAPSHOT update branches"
exit 0
Expand Down