jenkins: check version also on latest instead of only empty

Signed-off-by: Marc Mattmueller <marc.mattmueller@netmodule.com>
This commit is contained in:
Marc Mattmueller 2020-11-10 08:10:30 +01:00
parent ee9eb887c4
commit f735db2610
1 changed files with 9 additions and 2 deletions

11
Jenkinsfile vendored
View File

@ -40,7 +40,7 @@ pipeline {
stage('prepare') { stage('prepare') {
steps { steps {
script { script {
if("${params.RLS_VERSION}" != "") { if(isReleaseRequested("${params.RLS_VERSION}")) {
sh 'git submodule update' // set all submodules to freezed commit sh 'git submodule update' // set all submodules to freezed commit
} }
else { else {
@ -89,9 +89,16 @@ pipeline {
} }
def isReleaseRequested(versionParam) {
if((versionParam == "") || (versionParam == "latest")) {
return false
}
return true
}
def build_version(versionParam) { def build_version(versionParam) {
def gitCmd = "git describe --tags" def gitCmd = "git describe --tags"
if(versionParam == "") { if(!isReleaseRequested(versionParam)) {
gitCmd = "${gitCmd} --dirty" gitCmd = "${gitCmd} --dirty"
} }
gitversion = sh(returnStdout: true, script: "${gitCmd}").trim() gitversion = sh(returnStdout: true, script: "${gitCmd}").trim()