Skip to content

Commit ed64d39

Browse files
Bot Updating Templated Files
1 parent 3aec0b9 commit ed64d39

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
@@ -385,7 +385,9 @@ pipeline {
385385
// Build Docker container for push to LS Repo
386386
stage('Build-Single') {
387387
when {
388-
environment name: 'MULTIARCH', value: 'false'
388+
expression {
389+
env.MULTIARCH == 'false' || params.PACKAGE_CHECK == 'true'
390+
}
389391
environment name: 'EXIT_STATUS', value: ''
390392
}
391393
steps {
@@ -410,7 +412,10 @@ pipeline {
410412
// Build MultiArch Docker containers for push to LS Repo
411413
stage('Build-Multi') {
412414
when {
413-
environment name: 'MULTIARCH', value: 'true'
415+
allOf {
416+
environment name: 'MULTIARCH', value: 'true'
417+
expression { params.PACKAGE_CHECK == 'false' }
418+
}
414419
environment name: 'EXIT_STATUS', value: ''
415420
}
416421
parallel {
@@ -515,7 +520,7 @@ pipeline {
515520
sh '''#! /bin/bash
516521
set -e
517522
TEMPDIR=$(mktemp -d)
518-
if [ "${MULTIARCH}" == "true" ]; then
523+
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
519524
LOCAL_CONTAINER=${IMAGE}:amd64-${META_TAG}
520525
else
521526
LOCAL_CONTAINER=${IMAGE}:${META_TAG}
@@ -576,7 +581,7 @@ pipeline {
576581
steps {
577582
sh '''#! /bin/bash
578583
echo "Packages were updated. Cleaning up the image and exiting."
579-
if [ "${MULTIARCH}" == "true" ]; then
584+
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
580585
docker rmi ${IMAGE}:amd64-${META_TAG}
581586
else
582587
docker rmi ${IMAGE}:${META_TAG}
@@ -600,7 +605,7 @@ pipeline {
600605
steps {
601606
sh '''#! /bin/bash
602607
echo "There are no package updates. Cleaning up the image and exiting."
603-
if [ "${MULTIARCH}" == "true" ]; then
608+
if [ "${MULTIARCH}" == "true" ] && [ "${PACKAGE_CHECK}" == "false" ]; then
604609
docker rmi ${IMAGE}:amd64-${META_TAG}
605610
else
606611
docker rmi ${IMAGE}:${META_TAG}

0 commit comments

Comments
 (0)