Skip to content

Commit a0d14ce

Browse files
committed
Removed ci_skip
Signed-off-by: Jeonghyuk Park <[email protected]>
1 parent a960f46 commit a0d14ce

File tree

1 file changed

+2
-68
lines changed

1 file changed

+2
-68
lines changed

Jenkinsfile

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ def PIPELINE_CONTROL = [
2121
build: true,
2222
unit_test: true,
2323
system_test: true,
24-
cd_skip: false,
25-
ci_skip: false ]
24+
cd_skip: false
25+
]
2626

2727
/**
2828
* The result strings for a build status
@@ -162,45 +162,6 @@ pipeline {
162162
}
163163
}
164164

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-
204165
/************************************************************************
205166
* STAGE
206167
* -----
@@ -212,7 +173,6 @@ pipeline {
212173
*
213174
* EXECUTION CONDITIONS
214175
* --------------------
215-
* - PIPELINE_CONTROL.ci_skip is false
216176
* - PIPELINE_CONTROL.build is true or PIPELINE_CONTROL.smoke_test is true
217177
*
218178
* DESCRIPTION
@@ -227,9 +187,6 @@ pipeline {
227187
stage('Install Zowe CLI') {
228188
when {
229189
allOf {
230-
expression {
231-
return PIPELINE_CONTROL.ci_skip == false
232-
}
233190
expression {
234191
return PIPELINE_CONTROL.build || PIPELINE_CONTROL.smoke_test
235192
}
@@ -259,7 +216,6 @@ pipeline {
259216
*
260217
* EXECUTION CONDITIONS
261218
* --------------------
262-
* - PIPELINE_CONTROL.ci_skip is false
263219
* - PIPELINE_CONTROL.build is true
264220
*
265221
* DESCRIPTION
@@ -273,9 +229,6 @@ pipeline {
273229
stage('Install Dependencies') {
274230
when {
275231
allOf {
276-
expression {
277-
return PIPELINE_CONTROL.ci_skip == false
278-
}
279232
expression {
280233
return PIPELINE_CONTROL.build
281234
}
@@ -301,7 +254,6 @@ pipeline {
301254
*
302255
* EXECUTION CONDITIONS
303256
* --------------------
304-
* - PIPELINE_CONTROL.ci_skip is false
305257
* - PIPELINE_CONTROL.build is true
306258
*
307259
* DESCRIPTION
@@ -315,9 +267,6 @@ pipeline {
315267
stage('Build') {
316268
when {
317269
allOf {
318-
expression {
319-
return PIPELINE_CONTROL.ci_skip == false
320-
}
321270
expression {
322271
return PIPELINE_CONTROL.build
323272
}
@@ -347,7 +296,6 @@ pipeline {
347296
*
348297
* EXECUTION CONDITIONS
349298
* --------------------
350-
* - PIPELINE_CONTROL.ci_skip is false
351299
* - PIPELINE_CONTROL.unit_test is true
352300
*
353301
* ENVIRONMENT VARIABLES
@@ -387,9 +335,6 @@ pipeline {
387335
stage('Test: Unit') {
388336
when {
389337
allOf {
390-
expression {
391-
return PIPELINE_CONTROL.ci_skip == false
392-
}
393338
expression {
394339
return PIPELINE_CONTROL.unit_test
395340
}
@@ -451,7 +396,6 @@ pipeline {
451396
*
452397
* EXECUTION CONDITIONS
453398
* --------------------
454-
* - PIPELINE_CONTROL.ci_skip is false
455399
* - PIPELINE_CONTROL.system_test is true
456400
*
457401
* ENVIRONMENT VARIABLES
@@ -494,9 +438,6 @@ pipeline {
494438
stage('Test: System') {
495439
when {
496440
allOf {
497-
expression {
498-
return PIPELINE_CONTROL.ci_skip == false
499-
}
500441
expression {
501442
return PIPELINE_CONTROL.system_test
502443
}
@@ -556,9 +497,6 @@ pipeline {
556497
stage('Check for CD Skip') {
557498
when {
558499
allOf {
559-
expression {
560-
return PIPELINE_CONTROL.ci_skip == false
561-
}
562500
expression {
563501
return PIPELINE_CONTROL.cd_skip == false
564502
}
@@ -610,7 +548,6 @@ pipeline {
610548
*
611549
* EXECUTION CONDITIONS
612550
* --------------------
613-
* - PIPELINE_CONTROL.ci_skip is false
614551
* - The build is still successful and not unstable
615552
*
616553
* DESCRIPTION
@@ -625,9 +562,6 @@ pipeline {
625562
stage('Deploy') {
626563
when {
627564
allOf {
628-
expression {
629-
return PIPELINE_CONTROL.ci_skip == false
630-
}
631565
expression {
632566
return PIPELINE_CONTROL.cd_skip == false
633567
}

0 commit comments

Comments
 (0)