Cadoles/Jenkins
Cadoles
/
Jenkins
21
0
Fork 0
Code Issues 3 Pull Requests Releases Wiki Activity

fix(kube): replace special caracters in branch name again

This commit is contained in:
Philippe Caseiro 2023-06-19 16:44:24 +02:00
parent bad27aa934
commit d252924f22
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vars/kubecontainer.groovy
View File

@ -24,6 +24,7 @@ String buildAndPublishImage(Map options = [:]) {
String dockerRepositoryCredentialsId = options.get('dockerRepositoryCredentialsId', 'reg.cadoles.com-jenkins') String dockerRepositoryCredentialsId = options.get('dockerRepositoryCredentialsId', 'reg.cadoles.com-jenkins')
Boolean dryRun = options.get('dryRun', true) Boolean dryRun = options.get('dryRun', true)
Boolean skipVerifications = options.get('skipVerification', false) Boolean skipVerifications = options.get('skipVerification', false)
String currentBranch = env.BRANCH_NAME.replaceAll("[^a-zA-Z]+","_")
String projectRepository = env.JOB_NAME String projectRepository = env.JOB_NAME
if (env.BRANCH_NAME ==~ /^PR-.*$/) { if (env.BRANCH_NAME ==~ /^PR-.*$/) {
@ -47,7 +48,7 @@ String buildAndPublishImage(Map options = [:]) {
stage("Build image '${imageName}:${imageTag}'") { stage("Build image '${imageName}:${imageTag}'") {
git.withHTTPCredentials(gitCredentialsId) { git.withHTTPCredentials(gitCredentialsId) {
sh """ sh """
CURRENT_BRANCH=$( echo ${BRANCH_NAME} | | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]') make CURRENT_BRANCH=${currentBranch} make
""" """
} }
} }
@ -62,7 +63,7 @@ String buildAndPublishImage(Map options = [:]) {
utils.when(!dryRun) { utils.when(!dryRun) {
retry(2) { retry(2) {
sh """ sh """
CURRENT_BRANCH=$( echo ${BRANCH_NAME} | | tr -c '[:alnum:]\n\r' '_'| tr '[:upper:]' '[:lower:]') make CURRENT_BRANCH=${currentBranch} make release
""" """
} }
} }