Skip to content

Commit e1abaef

Browse files
committed
test: Remove retry in podman build and push
Do not need retry because registry is local now Signed-off-by: Xiaofeng Wang <[email protected]>
1 parent b22970a commit e1abaef

File tree

2 files changed

+5
-16
lines changed

2 files changed

+5
-16
lines changed

tests/e2e/bootc-install.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,10 @@ cat "$INSTALL_CONTAINERFILE"
169169

170170
# Build test bootc image and push to local registry
171171
greenprint "Build $TEST_OS installation container image"
172-
sudo podman build --tls-verify=false --retry=5 --retry-delay=10 -t "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" -f "$INSTALL_CONTAINERFILE" "$TEMPDIR"
172+
sudo podman build --tls-verify=false -t "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" -f "$INSTALL_CONTAINERFILE" "$TEMPDIR"
173173

174174
greenprint "Push $TEST_OS installation container image"
175-
retry sudo podman push --tls-verify=false --quiet "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" "$TEST_IMAGE_URL"
175+
sudo podman push --tls-verify=false --quiet "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" "$TEST_IMAGE_URL"
176176

177177
# Prepare Ansible inventory file and ansible.cfg
178178
greenprint "Prepare inventory file"
@@ -290,14 +290,14 @@ REALEOF
290290

291291
# Build upgrade container image and push to locay registry
292292
greenprint "Build $TEST_OS upgrade container image"
293-
sudo podman build --tls-verify=false --retry=5 --retry-delay=10 -t "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" -f "$UPGRADE_CONTAINERFILE" .
293+
sudo podman build --tls-verify=false -t "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" -f "$UPGRADE_CONTAINERFILE" .
294294

295295
greenprint "Push $TEST_OS upgrade container image"
296-
retry sudo podman push --tls-verify=false --quiet "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" "$TEST_IMAGE_URL"
296+
sudo podman push --tls-verify=false --quiet "${TEST_IMAGE_NAME}:${QUAY_REPO_TAG}" "$TEST_IMAGE_URL"
297297

298298
# Copy upgrade image to local folder for bootc switch test
299299
if [[ "$AIR_GAPPED_DIR" != "" ]]; then
300-
retry skopeo copy docker://"$TEST_IMAGE_URL" dir://"$AIR_GAPPED_DIR"
300+
skopeo copy docker://"$TEST_IMAGE_URL" dir://"$AIR_GAPPED_DIR"
301301
BOOTC_IMAGE="/mnt"
302302
else
303303
BOOTC_IMAGE="$TEST_IMAGE_URL"

tests/e2e/shared_lib.sh

-11
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,6 @@ function redprint {
3535
echo -e "\033[1;31m[$(date -Isecond)] ${1}\033[0m"
3636
}
3737

38-
# Retry container image pull and push
39-
function retry {
40-
n=0
41-
until [ "$n" -ge 3 ]
42-
do
43-
"$@" && break
44-
n=$((n+1))
45-
sleep 10
46-
done
47-
}
48-
4938
function deploy_libvirt_network {
5039
greenprint "Start firewalld"
5140
sudo systemctl enable --now firewalld

0 commit comments

Comments
 (0)