Skip to content

Commit db14a83

Browse files
Bodong-YangCopilot
andauthored
Apply suggestions from code review
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 82061ca commit db14a83

3 files changed

Lines changed: 13 additions & 4 deletions

File tree

tests/e2e/scripts/e2e_build_ota_image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ ${BUILDER} -d sign \
5050
${OTA_IMAGE_DIR}
5151
rm -rf ${CERT_DIR}/*.key
5252

53-
echo -e "\n------------ packe OTA image artifact ------------"
53+
echo -e "\n------------ pack OTA image artifact ------------"
5454
${BUILDER} -d pack-artifact \
5555
-o ${OTA_IMAGE_ARTIFACT_OUTPUT} ${OTA_IMAGE_DIR}
5656

tests/e2e/scripts/e2e_build_sys_img.sh

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,17 @@ cp ${SETUP_SCRIPT} ${ROOTFS}
1717
# ------ use podman to setup the exported system image ------ #
1818
podman run -d --replace --name setup_dind --privileged \
1919
--rootfs "$(realpath ${ROOTFS})" /usr/local/bin/dockerd-entrypoint.sh
20-
# NOTE: wait for the dockerd fully starts up
21-
sleep 16
20+
# Wait for dockerd inside the container to fully start up
21+
max_wait_seconds=30
22+
elapsed=0
23+
until podman exec setup_dind docker info >/dev/null 2>&1; do
24+
if [ "${elapsed}" -ge "${max_wait_seconds}" ]; then
25+
echo "dockerd did not become ready within ${max_wait_seconds} seconds" >&2
26+
exit 1
27+
fi
28+
sleep 1
29+
elapsed=$((elapsed + 1))
30+
done
2231

2332
podman exec setup_dind /e2e_setup_sys_img.sh
2433
podman stop setup_dind

tests/e2e/scripts/e2e_setup_sys_img.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ dd if=/dev/urandom of=/500M.img bs=1M count=500
4444
SPECIAL_FILE="path;adf.ae?qu.er\y=str#fragファイルement"
4545
echo -n "${SPECIAL_FILE}" > "/${SPECIAL_FILE}"
4646

47-
# ------ docker image pull suport ------ #
47+
# ------ docker image pull support ------ #
4848
BUSYBOX_VER=1.37.0
4949
docker image pull busybox:${BUSYBOX_VER}
5050

0 commit comments

Comments
 (0)