Skip to content

Commit bde8298

Browse files
Bot Updating Templated Files
1 parent 5800d33 commit bde8298

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
@@ -376,7 +376,9 @@ pipeline {
376376
// Build Docker container for push to LS Repo
377377
stage('Build-Single') {
378378
when {
379-
environment name: 'MULTIARCH', value: 'false'
379+
expression {
380+
env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
381+
}
380382
environment name: 'EXIT_STATUS', value: ''
381383
}
382384
steps {
@@ -401,7 +403,10 @@ pipeline {
401403
// Build MultiArch Docker containers for push to LS Repo
402404
stage('Build-Multi') {
403405
when {
404-
environment name: 'MULTIARCH', value: 'true'
406+
allOf {
407+
environment name: 'MULTIARCH', value: 'true'
408+
expression { params.PACKAGE_CHECK == 'false' }
409+
}
405410
environment name: 'EXIT_STATUS', value: ''
406411
}
407412
parallel {
@@ -506,7 +511,7 @@ pipeline {
506511
sh '''#! /bin/bash
507512
set -e
508513
TEMPDIR=$(mktemp -d)
509-
if [ "${MULTIARCH}" == "true" ]; then
514+
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
510515
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
511516
else
512517
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@@ -567,7 +572,7 @@ pipeline {
567572
steps {
568573
sh '''#! /bin/bash
569574
echo "Packages were updated. Cleaning up the image and exiting."
570-
if [ "${MULTIARCH}" == "true" ]; then
575+
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
571576
docker rmi ${IMAGE}:amd64-${META_TAG}
572577
else
573578
docker rmi ${IMAGE}:${META_TAG}
@@ -591,7 +596,7 @@ pipeline {
591596
steps {
592597
sh '''#! /bin/bash
593598
echo "There are no package updates. Cleaning up the image and exiting."
594-
if [ "${MULTIARCH}" == "true" ]; then
599+
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
595600
docker rmi ${IMAGE}:amd64-${META_TAG}
596601
else
597602
docker rmi ${IMAGE}:${META_TAG}

0 commit comments

Comments
 (0)