Skip to content

Commit a453238

Browse files
author
Blixt Daniel (Consultant)
committed
Clean-up syntax and whitespace
1 parent 576a042 commit a453238

File tree

2 files changed

+16
-14
lines changed

2 files changed

+16
-14
lines changed

Jenkinsfile

+1-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ try {
2323
// execute tests using the job-dsl-plugin for private branches
2424
stage ( 'Checkout' ) {
2525
scm checkout
26-
}
26+
}
2727
stage ( 'Build XML' ) {
2828
dir ('jobdsl-gradle') {
2929
sh script: '''
@@ -38,7 +38,6 @@ try {
3838
'''.stripIndent().trim()
3939
}
4040
}
41-
4241
stage ( 'Build Docker' ) {
4342
dir ('dockerizeit') {
4443
sh script: '''
@@ -51,7 +50,6 @@ try {
5150
'''.stripIndent().trim()
5251
}
5352
}
54-
5553
stage ( 'Generate compose yml' ) {
5654
dir ('dockerizeit') {
5755
sh script: '''

jobdsl-gradle/src/jobs/groovy/review_mb_pipeline.groovy

+15-11
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,33 @@ dslFactory.multibranchPipelineJob( "jenkins_as_a_code-review-pipeline" ) {
1717
if ( defaultBranch != "" ) {
1818
excludes ( defaultBranch )
1919
}
20+
// Parse out repository and organisation from default_repo
2021
repoTokens = defaultRepo.split(':')[-1].split('/')
2122
if (repoTokens.length > 2) {
22-
repoName = '/'.join(repoTokens[1..-1])
23-
repoOwner( ${repoTokens[0]}
23+
repoName = '/'.join(repoTokens[1..-1])
24+
repoOwner( ${repoTokens[0]} )
2425
} else if (repoTokens.length == 2 ) {
2526
repoName = repoTokens[1]
26-
repoOwner( ${repoTokens[0]}
27+
repoOwner( ${repoTokens[0]} )
2728
} else {
2829
repoName = repoTokens[0]
2930
}
3031
repository ( repoName )
32+
3133
scanCredentialsId ( "" )
3234
}
35+
}
3336

34-
triggers {
35-
periodic ( 240 )
36-
}
37+
triggers {
38+
// Scan MB-pipeline every 4hours.
39+
periodic ( 240 )
40+
}
3741

38-
// remove dead branches and logs
39-
orphanedItemStrategy {
40-
discardOldItems {
42+
// remove dead branches and logs
43+
orphanedItemStrategy {
44+
discardOldItems {
4145
numToKeep( 0 )
4246
daysToKeep( 1 )
43-
}
44-
}
47+
}
48+
}
4549
}

0 commit comments

Comments
 (0)