starlingx/jenkins-pipelines
Code Issues Proposed changes

build-docker-images: add retry delay

Browse Source 
Add retry delay to wheels and docker image build scripts.

TESTS
=================================
* Build docker base image, wheels and one docker image
* Check Jenkins logs and make sure scripts are called with --attempts
  and --retry-delay

Story: 2010055
Task:  48106

Depends-On: https://review.opendev.org/c/starlingx/root/+/877119
Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
Change-Id: I771e092ef340db8e639c121c0ebc990790eb0568
This commit is contained in:
Davlet Panech 2023-05-25 15:45:47 -04:00
parent 2ae368cc7f
commit eccb119877
5 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
scripts/build-docker-base.sh
View File

@ -8,6 +8,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
source $(dirname "$0")/lib/retries.sh
require_job_env BUILD_HOME require_job_env BUILD_HOME
require_job_env DRY_RUN require_job_env DRY_RUN
@ -37,6 +38,7 @@ declare -a cmd=(
"--os=$DOCKER_BASE_OS" "--os=$DOCKER_BASE_OS"
"--version=$base_image_tag" "--version=$base_image_tag"
"--attempts=$DOCKER_BUILD_RETRY_COUNT" "--attempts=$DOCKER_BUILD_RETRY_COUNT"
"--retry-delay=$DOCKER_BUILD_RETRY_DELAY"
"--stream=$BUILD_STREAM" "--stream=$BUILD_STREAM"
"--user=$DOCKER_REGISTRY_ORG" "--user=$DOCKER_REGISTRY_ORG"
"--latest" "--latest"
@ -72,7 +74,7 @@ stx_docker_cmd $DRY_RUN_ARG "cd \$MY_REPO/build-tools/build-docker-images && ${c
if $PUSH_DOCKER_IMAGES ; then if $PUSH_DOCKER_IMAGES ; then
for reg in $EXTRA_REGISTRY_PREFIX_LIST ; do for reg in $EXTRA_REGISTRY_PREFIX_LIST ; do
stx_docker_cmd $DRY_RUN_ARG "docker tag $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/stx-$DOCKER_BASE_OS:$base_image_tag $reg/stx-$DOCKER_BASE_OS:$base_image_tag" stx_docker_cmd $DRY_RUN_ARG "docker tag $DOCKER_REGISTRY/$DOCKER_REGISTRY_ORG/stx-$DOCKER_BASE_OS:$base_image_tag $reg/stx-$DOCKER_BASE_OS:$base_image_tag"
stx_docker_cmd $DRY_RUN_ARG "docker push $reg/stx-$DOCKER_BASE_OS:$base_image_tag" with_retries -d "$DOCKER_BUILD_RETRY_DELAY" "$DOCKER_BUILD_RETRY_COUNT" stx_docker_cmd $DRY_RUN_ARG "docker push $reg/stx-$DOCKER_BASE_OS:$base_image_tag"
done done
fi fi

4
scripts/build-docker-images.sh
View File

@ -8,6 +8,7 @@
set -e set -e
source $(dirname "$0")/lib/job_utils.sh source $(dirname "$0")/lib/job_utils.sh
source $(dirname "$0")/lib/retries.sh
require_job_env BUILD_HOME require_job_env BUILD_HOME
require_job_env DRY_RUN require_job_env DRY_RUN
@ -39,6 +40,7 @@ declare -a cmd=(
"./build-stx-images.sh" "./build-stx-images.sh"
"--os-label=$DOCKER_BASE_OS" "--os-label=$DOCKER_BASE_OS"
"--attempts=$DOCKER_BUILD_RETRY_COUNT" "--attempts=$DOCKER_BUILD_RETRY_COUNT"
"--retry-delay=$DOCKER_BUILD_RETRY_DELAY"
"--stream=$BUILD_STREAM" "--stream=$BUILD_STREAM"
"--version=$TIMESTAMP" "--version=$TIMESTAMP"
"--prefix=${BUILD_BRANCH_FOR_IMAGE_TAG}" "--prefix=${BUILD_BRANCH_FOR_IMAGE_TAG}"
@ -105,7 +107,7 @@ retag_and_push() {
for reg_prefix in $EXTRA_REGISTRY_PREFIX_LIST ; do for reg_prefix in $EXTRA_REGISTRY_PREFIX_LIST ; do
local dst_img="$(echo "${reg_prefix}/$base_img" | sed 's!//*!/!g')" local dst_img="$(echo "${reg_prefix}/$base_img" | sed 's!//*!/!g')"
stx_docker_cmd $DRY_RUN_ARG "docker tag $src_img $dst_img" stx_docker_cmd $DRY_RUN_ARG "docker tag $src_img $dst_img"
stx_docker_cmd $DRY_RUN_ARG "docker push $dst_img" with_retries -d "$DOCKER_BUILD_RETRY_DELAY" "$DOCKER_BUILD_RETRY_COUNT" stx_docker_cmd $DRY_RUN_ARG "docker push $dst_img"
done done
done done
fi fi

1
scripts/build-wheels.sh
View File

@ -80,6 +80,7 @@ cmd=(
"--os=$DOCKER_BASE_OS" "--os=$DOCKER_BASE_OS"
"--stream=$BUILD_STREAM" "--stream=$BUILD_STREAM"
"--attempts=$DOCKER_BUILD_RETRY_COUNT" "--attempts=$DOCKER_BUILD_RETRY_COUNT"
"--retry-delay=$DOCKER_BUILD_RETRY_DELAY"
) )
if [[ "$USE_DOCKER_CACHE" == true ]] ; then if [[ "$USE_DOCKER_CACHE" == true ]] ; then

2
scripts/lib/job_utils.sh
View File

@ -217,6 +217,8 @@ __set_build_vars() {
declare_job_env SIGN_MAX_ATTEMPTS 3 declare_job_env SIGN_MAX_ATTEMPTS 3
declare_job_env SIGN_BACKOFF_DELAY 10 declare_job_env SIGN_BACKOFF_DELAY 10
declare_job_env DOCKER_BUILD_RETRY_COUNT 3
declare_job_env DOCKER_BUILD_RETRY_DELAY 30
} }

3
scripts/templates/build.conf.example.in
View File

@ -147,6 +147,9 @@ PUBLISH_LATEST_LINK=false # create latest symlink?
# How many times to try building docker images # How many times to try building docker images
DOCKER_BUILD_RETRY_COUNT=3 DOCKER_BUILD_RETRY_COUNT=3
# Sleep between retries (seconds)
DOCKER_BUILD_RETRY_DELAY=30
# Docker config file used for authentication when pushing images. If empty, # Docker config file used for authentication when pushing images. If empty,
# defaults to $USER/.docker/config.json. May be relative to $BUILD_HOME. # defaults to $USER/.docker/config.json. May be relative to $BUILD_HOME.
DOCKER_CONFIG_FILE="docker-config.json" DOCKER_CONFIG_FILE="docker-config.json"