Ajustements
Some checks failed
Cadoles/Jenkins/pipeline/head There was a failure building this commit

This commit is contained in:
2022-02-08 08:33:09 +01:00
parent 471b11740e
commit 4ce857ef7c
2 changed files with 34 additions and 40 deletions

View File

@ -7,7 +7,7 @@ def buildPackageWithCPKG(
Boolean forceRebuild = false
) {
def builds = []
def result = [:]
// Retrieve commit tags
def commitTags = sh(script: 'git describe --exact-match --abbrev=0', returnStdout: true).split(' ')
@ -34,19 +34,17 @@ def buildPackageWithCPKG(
sh "rm -rf ${destDir}/*"
stage("Build ${packageEnv} package (version ${packageVersion}) for ${packageDistrib}") {
def result = [:]
result.put('tag', tag)
result.put('env', packageEnv)
result.put('version', packageVersion)
result.put('distrib', packageDistrib)
def packages = buildPackage(packageProfile, packageArch, baseImage, destDir, forceRebuild)
result.put('packages', packages)
builds << result
}
}
return builds
return result
}
@ -129,4 +127,4 @@ def buildDockerImage() {
def imageTag = "${safeJobName}-${env.BUILD_ID}"
return docker.build("tamarin:${imageTag}", ".")
}
}
}