Skip to content

Commit f83409f

Browse files
change of release condition (#105)
1 parent 944fb19 commit f83409f

File tree

1 file changed

+13
-13
lines changed

1 file changed

+13
-13
lines changed

Jenkinsfile

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,18 +55,18 @@ spec:
5555
stages {
5656
stage('Checkout release branch') {
5757
when {
58-
expression { return env.GIT_BRANCH == 'origin/master'; }
58+
expression { return env.GIT_BRANCH == 'master'; }
5959
}
6060
steps {
6161
sh 'git checkout -b release'
6262
}
6363
}
6464
stage('Merge to release branch') {
6565
when {
66-
expression { return env.GIT_BRANCH == 'origin/master'; }
66+
expression { return env.GIT_BRANCH == 'master'; }
6767
}
6868
steps {
69-
sh 'git merge origin/master'
69+
sh 'git merge master'
7070
}
7171
}
7272
stage('Remove SNAPSHOT from version') {
@@ -78,7 +78,7 @@ spec:
7878
}
7979
stage('Get version from pom.xml') {
8080
when {
81-
expression { return env.GIT_BRANCH == 'origin/master'; }
81+
expression { return env.GIT_BRANCH == 'master'; }
8282
}
8383
steps {
8484
script {
@@ -96,7 +96,7 @@ spec:
9696
}
9797
stage('Build docker image') {
9898
when {
99-
expression { return env.GIT_BRANCH == 'origin/master'; }
99+
expression { return env.GIT_BRANCH == 'master'; }
100100
}
101101
steps {
102102
container('docker-client') {
@@ -110,7 +110,7 @@ spec:
110110
}
111111
stage('Publish docker image') {
112112
when {
113-
expression { return env.GIT_BRANCH == 'origin/master'; }
113+
expression { return env.GIT_BRANCH == 'master'; }
114114
}
115115
steps {
116116
container('docker-client') {
@@ -125,7 +125,7 @@ spec:
125125
}
126126
stage('Remove unused docker image') {
127127
when {
128-
expression { return env.GIT_BRANCH == 'origin/master'; }
128+
expression { return env.GIT_BRANCH == 'master'; }
129129
}
130130
steps{
131131
container('docker-client') {
@@ -135,7 +135,7 @@ spec:
135135
}
136136
stage('Create github release with text from commits') {
137137
when {
138-
expression { return env.GIT_BRANCH == 'origin/master'; }
138+
expression { return env.GIT_BRANCH == 'master'; }
139139
}
140140
steps {
141141
script {
@@ -150,15 +150,15 @@ spec:
150150
}
151151
stage('Checkout master') {
152152
when {
153-
expression { return env.GIT_BRANCH == 'origin/master'; }
153+
expression { return env.GIT_BRANCH == 'master'; }
154154
}
155155
steps {
156-
sh 'git checkout origin/master'
156+
sh 'git checkout master'
157157
}
158158
}
159159
stage('Increase version in master') {
160160
when {
161-
expression { return env.GIT_BRANCH == 'origin/master'; }
161+
expression { return env.GIT_BRANCH == 'master'; }
162162
}
163163
steps {
164164
container('docker-client') {
@@ -168,7 +168,7 @@ spec:
168168
}
169169
stage('Push to master') {
170170
when {
171-
expression { return env.GIT_BRANCH == 'origin/master'; }
171+
expression { return env.GIT_BRANCH == 'master'; }
172172
}
173173
steps {
174174
script {
@@ -186,4 +186,4 @@ spec:
186186
cleanWs()
187187
}
188188
}
189-
}
189+
}

0 commit comments

Comments
 (0)