Skip to content

Commit 7cdbc1c

Browse files
Merge pull request openshift#6536 from celebdor/check-before-pull
OCPBUGS-2968: bootstrap: Do not needlessly podman pull
2 parents 4c5fce9 + 155f9d2 commit 7cdbc1c

File tree

1 file changed

+22
-16
lines changed

1 file changed

+22
-16
lines changed

data/data/bootstrap/files/usr/local/bin/release-image-download.sh.template

100755100644
Lines changed: 22 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,30 @@ set -euo pipefail
1313

1414
RELEASE_IMAGE={{.ReleaseImage}}
1515

16-
echo "Pulling $RELEASE_IMAGE..."
1716
release_image_issue="/etc/issue.d/50_release-image.issue"
18-
while true
19-
do
17+
if podman image exists "$RELEASE_IMAGE"; then
2018
record_service_stage_start "pull-release-image"
21-
if podman pull --quiet "$RELEASE_IMAGE"
22-
then
23-
rm -f "${release_image_issue}"
24-
agetty --reload
25-
record_service_stage_success
26-
break
27-
else
28-
printf '\n\\e{lightred}Unable to pull OpenShift release image\\e{reset}\n' >"${release_image_issue}"
29-
agetty --reload
30-
record_service_stage_failure
31-
echo "Pull failed. Retrying $RELEASE_IMAGE..."
32-
fi
33-
done
19+
record_service_stage_success
20+
else
21+
echo "Pulling $RELEASE_IMAGE..."
22+
while true
23+
do
24+
record_service_stage_start "pull-release-image"
25+
if podman pull --quiet "$RELEASE_IMAGE"
26+
then
27+
rm -f "${release_image_issue}"
28+
agetty --reload
29+
record_service_stage_success
30+
break
31+
else
32+
printf '\n\\e{lightred}Unable to pull OpenShift release image\\e{reset}\n' >"${release_image_issue}"
33+
agetty --reload
34+
record_service_stage_failure
35+
echo "Pull failed. Retrying $RELEASE_IMAGE..."
36+
fi
37+
done
38+
fi
39+
3440

3541
# Sanity check the image metadata to see if the arches match
3642
record_service_stage_start "image-metadata-arches-match"

0 commit comments

Comments
 (0)