change of release condition (#105)

This commit is contained in:
Rustam Gimadiev 2020-10-22 14:23:28 +03:00 committed by GitHub
parent 944fb19cb9
commit f83409f8f5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

24
Jenkinsfile vendored
View file

@ -55,7 +55,7 @@ spec:
stages { stages {
stage('Checkout release branch') { stage('Checkout release branch') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps { steps {
sh 'git checkout -b release' sh 'git checkout -b release'
@ -63,10 +63,10 @@ spec:
} }
stage('Merge to release branch') { stage('Merge to release branch') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps { steps {
sh 'git merge origin/master' sh 'git merge master'
} }
} }
stage('Remove SNAPSHOT from version') { stage('Remove SNAPSHOT from version') {
@ -78,7 +78,7 @@ spec:
} }
stage('Get version from pom.xml') { stage('Get version from pom.xml') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps { steps {
script { script {
@ -96,7 +96,7 @@ spec:
} }
stage('Build docker image') { stage('Build docker image') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps { steps {
container('docker-client') { container('docker-client') {
@ -110,7 +110,7 @@ spec:
} }
stage('Publish docker image') { stage('Publish docker image') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps { steps {
container('docker-client') { container('docker-client') {
@ -125,7 +125,7 @@ spec:
} }
stage('Remove unused docker image') { stage('Remove unused docker image') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps{ steps{
container('docker-client') { container('docker-client') {
@ -135,7 +135,7 @@ spec:
} }
stage('Create github release with text from commits') { stage('Create github release with text from commits') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps { steps {
script { script {
@ -150,15 +150,15 @@ spec:
} }
stage('Checkout master') { stage('Checkout master') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps { steps {
sh 'git checkout origin/master' sh 'git checkout master'
} }
} }
stage('Increase version in master') { stage('Increase version in master') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps { steps {
container('docker-client') { container('docker-client') {
@ -168,7 +168,7 @@ spec:
} }
stage('Push to master') { stage('Push to master') {
when { when {
expression { return env.GIT_BRANCH == 'origin/master'; } expression { return env.GIT_BRANCH == 'master'; }
} }
steps { steps {
script { script {