|
@@ -59,7 +59,7 @@ spec:
|
|
stages {
|
|
stages {
|
|
stage('Checkout release branch') {
|
|
stage('Checkout release branch') {
|
|
when {
|
|
when {
|
|
- expression { return env.GIT_BRANCH == 'master'; }
|
|
|
|
|
|
+ expression { return env.GIT_BRANCH == /.*master$/; }
|
|
}
|
|
}
|
|
steps {
|
|
steps {
|
|
sh 'git checkout -b release'
|
|
sh 'git checkout -b release'
|
|
@@ -67,7 +67,7 @@ spec:
|
|
}
|
|
}
|
|
stage('Merge to release branch') {
|
|
stage('Merge to release branch') {
|
|
when {
|
|
when {
|
|
- expression { return env.GIT_BRANCH == 'master'; }
|
|
|
|
|
|
+ expression { return env.GIT_BRANCH == /.*master$/; }
|
|
}
|
|
}
|
|
steps {
|
|
steps {
|
|
sh 'git merge origin/master'
|
|
sh 'git merge origin/master'
|
|
@@ -85,7 +85,7 @@ spec:
|
|
}
|
|
}
|
|
stage('Get version from pom.xml') {
|
|
stage('Get version from pom.xml') {
|
|
when {
|
|
when {
|
|
- expression { return env.GIT_BRANCH == 'master'; }
|
|
|
|
|
|
+ expression { return env.GIT_BRANCH == /.*master$/; }
|
|
}
|
|
}
|
|
steps {
|
|
steps {
|
|
script {
|
|
script {
|