From 5bd87948d84c4fc644160a094f28324817e8ffb1 Mon Sep 17 00:00:00 2001 From: Peixin Li Date: Tue, 10 Oct 2023 16:27:25 +0800 Subject: [PATCH] fix docker modified check in premerge Signed-off-by: Peixin Li --- jenkins/Jenkinsfile-blossom.premerge | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jenkins/Jenkinsfile-blossom.premerge b/jenkins/Jenkinsfile-blossom.premerge index 340647df333..72cc7fca0c3 100755 --- a/jenkins/Jenkinsfile-blossom.premerge +++ b/jenkins/Jenkinsfile-blossom.premerge @@ -134,9 +134,10 @@ pipeline { container('cpu') { // check if pre-merge dockerfile modified def dockerfileModified = sh(returnStdout: true, - script: 'BASE=$(git --no-pager log --oneline -1 | awk \'{ print $NF }\'); ' + - 'git --no-pager diff --name-only HEAD $(git merge-base HEAD $BASE) ' + - "-- ${PREMERGE_DOCKERFILE} || true") +script: """BASE=\$(git --no-pager log --oneline -1 | awk \'{ print \$NF }\') +git --no-pager diff --name-only HEAD \$BASE -- ${PREMERGE_DOCKERFILE} || true""").trim() + echo "$dockerfileModified" + if (!dockerfileModified?.trim()) { TEMP_IMAGE_BUILD = false }