Skip to content

Commit a9ea1fe

Browse files
Bot Updating Templated Files
1 parent 323745a commit a9ea1fe

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

Jenkinsfile

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,9 @@ pipeline {
375375
// Build Docker container for push to LS Repo
376376
stage('Build-Single') {
377377
when {
378-
environment name: 'MULTIARCH', value: 'false'
378+
expression {
379+
env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
380+
}
379381
environment name: 'EXIT_STATUS', value: ''
380382
}
381383
steps {
@@ -400,7 +402,10 @@ pipeline {
400402
// Build MultiArch Docker containers for push to LS Repo
401403
stage('Build-Multi') {
402404
when {
403-
environment name: 'MULTIARCH', value: 'true'
405+
allOf {
406+
environment name: 'MULTIARCH', value: 'true'
407+
expression { params.PACKAGE_CHECK == 'false' }
408+
}
404409
environment name: 'EXIT_STATUS', value: ''
405410
}
406411
parallel {
@@ -505,7 +510,7 @@ pipeline {
505510
sh '''#! /bin/bash
506511
set -e
507512
TEMPDIR=$(mktemp -d)
508-
if [ "${MULTIARCH}" == "true" ]; then
513+
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
509514
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
510515
else
511516
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@@ -566,7 +571,7 @@ pipeline {
566571
steps {
567572
sh '''#! /bin/bash
568573
echo "Packages were updated. Cleaning up the image and exiting."
569-
if [ "${MULTIARCH}" == "true" ]; then
574+
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
570575
docker rmi ${IMAGE}:amd64-${META_TAG}
571576
else
572577
docker rmi ${IMAGE}:${META_TAG}
@@ -590,7 +595,7 @@ pipeline {
590595
steps {
591596
sh '''#! /bin/bash
592597
echo "There are no package updates. Cleaning up the image and exiting."
593-
if [ "${MULTIARCH}" == "true" ]; then
598+
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
594599
docker rmi ${IMAGE}:amd64-${META_TAG}
595600
else
596601
docker rmi ${IMAGE}:${META_TAG}

0 commit comments

Comments
 (0)