@@ -55,18 +55,18 @@ spec:
55
55
stages {
56
56
stage(' Checkout release branch' ) {
57
57
when {
58
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
58
+ expression { return env. GIT_BRANCH == ' master' ; }
59
59
}
60
60
steps {
61
61
sh ' git checkout -b release'
62
62
}
63
63
}
64
64
stage(' Merge to release branch' ) {
65
65
when {
66
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
66
+ expression { return env. GIT_BRANCH == ' master' ; }
67
67
}
68
68
steps {
69
- sh ' git merge origin/ master'
69
+ sh ' git merge master'
70
70
}
71
71
}
72
72
stage(' Remove SNAPSHOT from version' ) {
78
78
}
79
79
stage(' Get version from pom.xml' ) {
80
80
when {
81
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
81
+ expression { return env. GIT_BRANCH == ' master' ; }
82
82
}
83
83
steps {
84
84
script {
96
96
}
97
97
stage(' Build docker image' ) {
98
98
when {
99
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
99
+ expression { return env. GIT_BRANCH == ' master' ; }
100
100
}
101
101
steps {
102
102
container(' docker-client' ) {
@@ -110,7 +110,7 @@ spec:
110
110
}
111
111
stage(' Publish docker image' ) {
112
112
when {
113
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
113
+ expression { return env. GIT_BRANCH == ' master' ; }
114
114
}
115
115
steps {
116
116
container(' docker-client' ) {
@@ -125,7 +125,7 @@ spec:
125
125
}
126
126
stage(' Remove unused docker image' ) {
127
127
when {
128
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
128
+ expression { return env. GIT_BRANCH == ' master' ; }
129
129
}
130
130
steps{
131
131
container(' docker-client' ) {
@@ -135,7 +135,7 @@ spec:
135
135
}
136
136
stage(' Create github release with text from commits' ) {
137
137
when {
138
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
138
+ expression { return env. GIT_BRANCH == ' master' ; }
139
139
}
140
140
steps {
141
141
script {
@@ -150,15 +150,15 @@ spec:
150
150
}
151
151
stage(' Checkout master' ) {
152
152
when {
153
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
153
+ expression { return env. GIT_BRANCH == ' master' ; }
154
154
}
155
155
steps {
156
- sh ' git checkout origin/ master'
156
+ sh ' git checkout master'
157
157
}
158
158
}
159
159
stage(' Increase version in master' ) {
160
160
when {
161
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
161
+ expression { return env. GIT_BRANCH == ' master' ; }
162
162
}
163
163
steps {
164
164
container(' docker-client' ) {
@@ -168,7 +168,7 @@ spec:
168
168
}
169
169
stage(' Push to master' ) {
170
170
when {
171
- expression { return env. GIT_BRANCH == ' origin/ master' ; }
171
+ expression { return env. GIT_BRANCH == ' master' ; }
172
172
}
173
173
steps {
174
174
script {
@@ -186,4 +186,4 @@ spec:
186
186
cleanWs()
187
187
}
188
188
}
189
- }
189
+ }
0 commit comments