Skip to content

Commit 19a572d

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

File tree

2 files changed

+18
-14
lines changed

2 files changed

+18
-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

+17-11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
import job.Helpers
2+
13
import javaposse.jobdsl.dsl.DslFactory
24
import javaposse.jobdsl.dsl.Job
35

@@ -17,29 +19,33 @@ dslFactory.multibranchPipelineJob( "jenkins_as_a_code-review-pipeline" ) {
1719
if ( defaultBranch != "" ) {
1820
excludes ( defaultBranch )
1921
}
22+
// Parse out repository and organisation from default_repo
2023
repoTokens = defaultRepo.split(':')[-1].split('/')
2124
if (repoTokens.length > 2) {
22-
repoName = '/'.join(repoTokens[1..-1])
23-
repoOwner( ${repoTokens[0]}
25+
repoName = '/'.join(repoTokens[1..-1])
26+
repoOwner( ${repoTokens[0]} )
2427
} else if (repoTokens.length == 2 ) {
2528
repoName = repoTokens[1]
26-
repoOwner( ${repoTokens[0]}
29+
repoOwner( ${repoTokens[0]} )
2730
} else {
2831
repoName = repoTokens[0]
2932
}
3033
repository ( repoName )
34+
3135
scanCredentialsId ( "" )
3236
}
37+
}
3338

34-
triggers {
35-
periodic ( 240 )
36-
}
39+
triggers {
40+
// Scan MB-pipeline every 4hours.
41+
periodic ( 240 )
42+
}
3743

38-
// remove dead branches and logs
39-
orphanedItemStrategy {
40-
discardOldItems {
44+
// remove dead branches and logs
45+
orphanedItemStrategy {
46+
discardOldItems {
4147
numToKeep( 0 )
4248
daysToKeep( 1 )
43-
}
44-
}
49+
}
50+
}
4551
}

0 commit comments

Comments
 (0)