starlingx
/
jenkins-pipelines
Code Issues Proposed changes

New parameter BUILD_DOCKER_BASE_IMAGE 

Story: 2010226
Task: 46050

Signed-off-by: Davlet Panech <davlet.panech@windriver.com>
Change-Id: I4bf59ed34e24687831db3ae87aa2b126ed0c4003
This commit is contained in:
Davlet Panech 2022-08-19 10:25:08 -04:00
parent 86aca968d3
commit 354f428724
3 changed files with 44 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
pipelines/monolithic.Jenkinsfile
View File

@ -139,12 +139,15 @@ pipeline {
booleanParam (
name: 'FORCE_BUILD_WHEELS'
)
string (
name: 'DOCKER_IMAGE_LIST'
booleanParam (
name: 'BUILD_DOCKER_BASE_IMAGE'
)
booleanParam (
name: 'BUILD_DOCKER_IMAGES'
)
string (
name: 'DOCKER_IMAGE_LIST'
)
booleanParam (
name: 'PUSH_DOCKER_IMAGES'
)
@ -213,22 +216,30 @@ pipeline {
}
} // stage('ISO')
stage('IMAGES') {
when { expression { params.BUILD_DOCKER_IMAGES } }
when { expression { params.BUILD_DOCKER_BASE_IMAGE || params.BUILD_DOCKER_IMAGES } }
stages {
stage('IMAGES:wheels') { steps { script {
runPart ("build-wheels", IMG_PARAMS)
runPart ("publish-wheels", IMG_PARAMS)
} } }
stage('IMAGES:base') { steps { script {
runPart ("build-docker-base", IMG_PARAMS)
runPart ("build-docker-images", IMG_PARAMS)
} } }
stage('IMAGES:images') { steps { script {
runPart ("build-docker-images", IMG_PARAMS)
runPart ("publish-docker-images", IMG_PARAMS)
} } }
stage('IMAGES:base') {
when { expression { params.BUILD_DOCKER_BASE_IMAGE } }
steps { script {
runPart ("build-docker-base", IMG_PARAMS)
} }
}
stage('IMAGES:wheels') {
when { expression { params.BUILD_DOCKER_IMAGES } }
steps { script {
runPart ("build-wheels", IMG_PARAMS)
runPart ("publish-wheels", IMG_PARAMS)
} }
}
stage('IMAGES:images') {
when { expression { params.BUILD_DOCKER_IMAGES } }
steps { script {
runPart ("build-docker-images", IMG_PARAMS)
runPart ("publish-docker-images", IMG_PARAMS)
} }
}
stage('IMAGES:helm') {
when { expression { params.BUILD_HELM_CHARTS } }
when { expression { params.BUILD_DOCKER_IMAGES && params.BUILD_HELM_CHARTS } }
steps { script {
runPart ("build-helm-charts", IMG_PARAMS)
runPart ("publish-helm-charts", IMG_PARAMS)

3
pipelines/parts/build-docker-images.Jenkinsfile
View File

@ -43,6 +43,9 @@ pipeline {
string (
name: 'BUILD_STREAM'
)
booleanParam (
name: 'BUILD_DOCKER_BASE_IMAGE'
)
string (
name: 'DOCKER_IMAGE_LIST'
)

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

@ -12,10 +12,11 @@ source $(dirname "$0")/lib/job_utils.sh
require_env BUILD_HOME
require_env DRY_RUN
require_env USE_DOCKER_CACHE
require_env BUILD_DOCKER_BASE_IMAGE
require_env BUILD_STREAM stable
require_env PUSH_DOCKER_IMAGES
declare_env DOCKER_IMAGE_LIST
declare_env DOCKER_IMAGE_BASE
declare_env DOCKER_BASE_IMAGE
load_build_env
@ -24,21 +25,10 @@ wheels_file="std/build-wheels-$DOCKER_BASE_OS-$BUILD_STREAM/stx-$DOCKER_BASE_OS-
#require_file "$HOST_WORKSPACE/$wheels_file"
if [[ -n "$DOCKER_IMAGE_BASE" ]] ; then
base_img="$DOCKER_IMAGE_BASE"
else
base_image_tag="$BUILD_BRANCH-$BUILD_STREAM-$TIMESTAMP"
base_img="$DOCKER_REGISTRY_ORG/stx-$DOCKER_BASE_OS:$base_image_tag"
if [[ -n "$DOCKER_REGISTRY" ]] ; then
base_img="$DOCKER_REGISTRY/$base_img"
fi
fi
declare -a cmd=(
"./build-stx-images.sh"
"--attempts=$DOCKER_BUILD_RETRY_COUNT"
"--stream=$BUILD_STREAM"
"--base=$base_img"
"--no-pull-base"
"--version=$TIMESTAMP"
"--prefix=$BUILD_BRANCH"
@ -46,6 +36,18 @@ declare -a cmd=(
"--latest"
)
# Base image provided by build parameter
if [[ -n "$DOCKER_BASE_IMAGE" ]] ; then
cmd+=("--base=$DOCKER_BASE_IMAGE")
elif $BUILD_DOCKER_BASE_IMAGE ; then
base_image_tag="$BUILD_BRANCH-$BUILD_STREAM-$TIMESTAMP"
docker_base_image="$DOCKER_REGISTRY_ORG/stx-$DOCKER_BASE_OS:$base_image_tag"
if [[ -n "$DOCKER_REGISTRY" ]] ; then
docker_base_image="$DOCKER_REGISTRY/$docker_base_image"
fi
cmd+=("--base=$docker_base_image")
fi
if [[ -n "$DOCKER_REGISTRY" ]] ; then
cmd+=("--registry=$DOCKER_REGISTRY")
fi