From 7ee4344adc31b9d1b1cac698ea7161c00f0c0fcd Mon Sep 17 00:00:00 2001 From: William Petit Date: Thu, 6 Apr 2023 10:30:40 +0200 Subject: [PATCH] fix(jenkins): do not trigger emissary-firmware with dirty tag --- Jenkinsfile | 28 ++++++++++++++++------------ 1 file changed, 16 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index cac8134..a030b70 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,9 +15,9 @@ pipeline { script { withCredentials([ usernamePassword([ - credentialsId: 'forge-jenkins', - usernameVariable: 'GIT_USERNAME', - passwordVariable: 'GIT_PASSWORD' + credentialsId: 'forge-jenkins', + usernameVariable: 'GIT_USERNAME', + passwordVariable: 'GIT_PASSWORD' ]) ]) { sh ''' @@ -43,20 +43,24 @@ pipeline { script { withCredentials([ usernamePassword([ - credentialsId: 'forge-jenkins', - usernameVariable: 'GITEA_RELEASE_USERNAME', - passwordVariable: 'GITEA_RELEASE_PASSWORD' + credentialsId: 'forge-jenkins', + usernameVariable: 'GITEA_RELEASE_USERNAME', + passwordVariable: 'GITEA_RELEASE_PASSWORD' ]) ]) { sh 'make gitea-release' } def currentVersion = sh(returnStdout: true, script: 'make full-version').trim() - build( - job: "../emissary-firmware/${env.GIT_BRANCH}", - parameters: [ - [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion] - ] - ) + if (currentVersion.endsWith('-dirty')) { + unstable('Could not trigger emissary-firmware build, dirty version !') + } else { + build( + job: "../emissary-firmware/${env.GIT_BRANCH}", + parameters: [ + [$class: 'StringParameterValue', name: 'emissaryRelease', value: currentVersion] + ] + ) + } } } }