@@ -21,8 +21,8 @@ def PIPELINE_CONTROL = [
21
21
build : true ,
22
22
unit_test : true ,
23
23
system_test : true ,
24
- cd_skip : false ,
25
- ci_skip : false ]
24
+ cd_skip : false
25
+ ]
26
26
27
27
/**
28
28
* The result strings for a build status
@@ -162,45 +162,6 @@ pipeline {
162
162
}
163
163
}
164
164
165
- /* ***********************************************************************
166
- * STAGE
167
- * -----
168
- * Check for CI Skip
169
- *
170
- * TIMEOUT
171
- * -------
172
- * 2 Minutes
173
- *
174
- * EXECUTION CONDITIONS
175
- * --------------------
176
- * - Always
177
- *
178
- * DECRIPTION
179
- * ----------
180
- * Checks for the [ci skip] text in the last commit. If it is present,
181
- * the build is stopped. Needed because the pipeline does do some simple
182
- * git commits on the master branch for the purposes of version bumping.
183
- *
184
- * OUTPUTS
185
- * -------
186
- * PIPELINE_CONTROL.ci_skip will be set to 'true' if [ci skip] is found in the
187
- * commit text.
188
- ************************************************************************/
189
- stage(' Check for CI Skip' ) {
190
- steps {
191
- timeout(time : 2 , unit : ' MINUTES' ) {
192
- script {
193
- // This checks for the [ci skip] text. If found, the status code is 0
194
- def result = sh returnStatus : true , script : ' git log -1 | grep \' .*\\ [ci skip\\ ].*\' '
195
- if (result == 0 ) {
196
- echo ' "ci skip" spotted in the git commit. Aborting.'
197
- PIPELINE_CONTROL . ci_skip = true
198
- }
199
- }
200
- }
201
- }
202
- }
203
-
204
165
/* ***********************************************************************
205
166
* STAGE
206
167
* -----
@@ -212,7 +173,6 @@ pipeline {
212
173
*
213
174
* EXECUTION CONDITIONS
214
175
* --------------------
215
- * - PIPELINE_CONTROL.ci_skip is false
216
176
* - PIPELINE_CONTROL.build is true or PIPELINE_CONTROL.smoke_test is true
217
177
*
218
178
* DESCRIPTION
@@ -227,9 +187,6 @@ pipeline {
227
187
stage(' Install Zowe CLI' ) {
228
188
when {
229
189
allOf {
230
- expression {
231
- return PIPELINE_CONTROL . ci_skip == false
232
- }
233
190
expression {
234
191
return PIPELINE_CONTROL . build || PIPELINE_CONTROL . smoke_test
235
192
}
@@ -259,7 +216,6 @@ pipeline {
259
216
*
260
217
* EXECUTION CONDITIONS
261
218
* --------------------
262
- * - PIPELINE_CONTROL.ci_skip is false
263
219
* - PIPELINE_CONTROL.build is true
264
220
*
265
221
* DESCRIPTION
@@ -273,9 +229,6 @@ pipeline {
273
229
stage(' Install Dependencies' ) {
274
230
when {
275
231
allOf {
276
- expression {
277
- return PIPELINE_CONTROL . ci_skip == false
278
- }
279
232
expression {
280
233
return PIPELINE_CONTROL . build
281
234
}
@@ -301,7 +254,6 @@ pipeline {
301
254
*
302
255
* EXECUTION CONDITIONS
303
256
* --------------------
304
- * - PIPELINE_CONTROL.ci_skip is false
305
257
* - PIPELINE_CONTROL.build is true
306
258
*
307
259
* DESCRIPTION
@@ -315,9 +267,6 @@ pipeline {
315
267
stage(' Build' ) {
316
268
when {
317
269
allOf {
318
- expression {
319
- return PIPELINE_CONTROL . ci_skip == false
320
- }
321
270
expression {
322
271
return PIPELINE_CONTROL . build
323
272
}
@@ -347,7 +296,6 @@ pipeline {
347
296
*
348
297
* EXECUTION CONDITIONS
349
298
* --------------------
350
- * - PIPELINE_CONTROL.ci_skip is false
351
299
* - PIPELINE_CONTROL.unit_test is true
352
300
*
353
301
* ENVIRONMENT VARIABLES
@@ -387,9 +335,6 @@ pipeline {
387
335
stage(' Test: Unit' ) {
388
336
when {
389
337
allOf {
390
- expression {
391
- return PIPELINE_CONTROL . ci_skip == false
392
- }
393
338
expression {
394
339
return PIPELINE_CONTROL . unit_test
395
340
}
@@ -451,7 +396,6 @@ pipeline {
451
396
*
452
397
* EXECUTION CONDITIONS
453
398
* --------------------
454
- * - PIPELINE_CONTROL.ci_skip is false
455
399
* - PIPELINE_CONTROL.system_test is true
456
400
*
457
401
* ENVIRONMENT VARIABLES
@@ -494,9 +438,6 @@ pipeline {
494
438
stage(' Test: System' ) {
495
439
when {
496
440
allOf {
497
- expression {
498
- return PIPELINE_CONTROL . ci_skip == false
499
- }
500
441
expression {
501
442
return PIPELINE_CONTROL . system_test
502
443
}
@@ -556,9 +497,6 @@ pipeline {
556
497
stage(' Check for CD Skip' ) {
557
498
when {
558
499
allOf {
559
- expression {
560
- return PIPELINE_CONTROL . ci_skip == false
561
- }
562
500
expression {
563
501
return PIPELINE_CONTROL . cd_skip == false
564
502
}
@@ -610,7 +548,6 @@ pipeline {
610
548
*
611
549
* EXECUTION CONDITIONS
612
550
* --------------------
613
- * - PIPELINE_CONTROL.ci_skip is false
614
551
* - The build is still successful and not unstable
615
552
*
616
553
* DESCRIPTION
@@ -625,9 +562,6 @@ pipeline {
625
562
stage(' Deploy' ) {
626
563
when {
627
564
allOf {
628
- expression {
629
- return PIPELINE_CONTROL . ci_skip == false
630
- }
631
565
expression {
632
566
return PIPELINE_CONTROL . cd_skip == false
633
567
}
0 commit comments