From 5e800741e0089e2c3bce21dfa800d08ef2bfe643 Mon Sep 17 00:00:00 2001 From: alexm Date: Thu, 27 Mar 2025 13:40:57 +0100 Subject: [PATCH] fix: refs #8715 update COMPOSE_TAG logic in Jenkinsfile to use CHANGE_TARGET for diff output --- Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 10b282ec6..8169bad29 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -22,6 +22,7 @@ node { IS_PROTECTED_BRANCH = PROTECTED_BRANCH.contains(env.BRANCH_NAME) IS_LATEST = ['master', 'main'].contains(env.BRANCH_NAME) + COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' // https://www.jenkins.io/doc/book/pipeline/jenkinsfile/#using-environment-variables echo "NODE_NAME: ${env.NODE_NAME}" @@ -82,7 +83,7 @@ pipeline { steps { script { def diffOutput = sh( - script: "git fetch origin ${TARGET_BRANCH} && git diff --name-only origin/${TARGET_BRANCH}", + script: "git diff --name-only origin/${COMPOSE_TAG}", returnStdout: true ).trim().split('\n') echo "DIFF: ${diffOutput}" @@ -135,7 +136,6 @@ pipeline { script { sh 'rm -f junit/e2e-*.xml' sh 'rm -rf test/cypress/screenshots' - env.COMPOSE_TAG = PROTECTED_BRANCH.contains(env.CHANGE_TARGET) ? env.CHANGE_TARGET : 'dev' def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')