Skip to content

Commit 59cf7e0

Browse files
authored
update ci pipeline with timeout and parallel java 7 (#1313)
* update ci pipeline with timeout and parallel java 7 * split credential scan and style check * fix ci yaml * update job name
1 parent f6673c0 commit 59cf7e0

File tree

1 file changed

+61
-34
lines changed

1 file changed

+61
-34
lines changed

.azure-pipelines/fluentJavaMgmt.yml

Lines changed: 61 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,19 @@ variables:
1212
LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=error -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
1313

1414
jobs:
15-
- job: 'Build'
16-
15+
- job: 'CredentialScan'
16+
timeoutInMinutes: 120
1717
strategy:
1818
matrix:
19-
2019
Windows - Java 8:
2120
OSName: 'Windows'
2221
OSVmImage: 'vs2017-win2016'
2322
JavaVersion: '1.8'
2423
ProfileFlag: ''
25-
# Windows - Java 7:
26-
# OSName: 'Windows'
27-
# OSVmImage: 'vs2017-win2016'
28-
# JavaVersion: '1.7'
29-
# ProfileFlag: ''
3024

3125
pool:
3226
vmImage: $(OSVmImage)
33-
27+
3428
steps:
3529
- task: ms-codeanalysis.vss-microsoft-security-code-analysis-devops.build-task-credscan.CredScan@2
3630
displayName: 'Run Credential Scanner'
@@ -47,7 +41,27 @@ jobs:
4741
RoslynAnalyzers: false
4842
TSLint: false
4943
ToolLogsNotFoundAction: 'Standard'
50-
44+
45+
- task: PublishTestResults@2
46+
condition: succeededOrFailed()
47+
inputs:
48+
mergeTestResults: true
49+
testRunTitle: 'on Credential Scan'
50+
51+
- job: 'StyleCheck'
52+
timeoutInMinutes: 120
53+
strategy:
54+
matrix:
55+
Windows - Java 8:
56+
OSName: 'Windows'
57+
OSVmImage: 'vs2017-win2016'
58+
JavaVersion: '1.8'
59+
ProfileFlag: ''
60+
61+
pool:
62+
vmImage: $(OSVmImage)
63+
64+
steps:
5165
- task: Maven@3
5266
displayName: 'install'
5367
inputs:
@@ -59,17 +73,7 @@ jobs:
5973
jdkArchitectureOption: 'x64'
6074
publishJUnitResults: false
6175
goals: 'install'
62-
63-
- task: JavaToolInstaller@0
64-
displayName: 'Install Azul JDK 1.7'
65-
inputs:
66-
versionSpec: '7'
67-
jdkArchitectureOption: 'x64'
68-
jdkSourceOption: LocalDirectory
69-
jdkFile: "ci/zulu-7-azure-jdk_7.29.0.5-7.0.222-win_x64.zip"
70-
jdkDestinationDirectory: '$(Agent.ToolsDirectory)/jdk7'
71-
cleanDestinationDirectory: true
72-
76+
7377
- task: Maven@3
7478
displayName: 'Run StyleCheck'
7579
inputs:
@@ -82,48 +86,71 @@ jobs:
8286
publishJUnitResults: false
8387
goals: 'checkstyle:check'
8488

89+
- task: PublishTestResults@2
90+
condition: succeededOrFailed()
91+
inputs:
92+
mergeTestResults: true
93+
testRunTitle: 'on Style Check'
94+
95+
- job: 'Test'
96+
timeoutInMinutes: 120
97+
98+
strategy:
99+
matrix:
100+
101+
Windows - Java 8:
102+
OSName: 'Windows'
103+
OSVmImage: 'vs2017-win2016'
104+
JavaVersion: '1.8'
105+
ProfileFlag: ''
106+
Windows - Java 7:
107+
OSName: 'Windows'
108+
OSVmImage: 'vs2017-win2016'
109+
JavaVersion: '1.7'
110+
ProfileFlag: ''
111+
112+
pool:
113+
vmImage: $(OSVmImage)
114+
115+
steps:
85116
- task: Maven@3
86-
displayName: 'Start Jetty'
117+
displayName: 'install'
87118
inputs:
88119
mavenPomFile: pom.xml
89-
options: '$(ProfileFlag)'
120+
options: '--batch-mode $(DefaultOptions) $(ProfileFlag) -pl !azure-samples javadoc:aggregate -DskipTests=true -DpackageOutputDirectory=$(Build.ArtifactStagingDirectory)" -am'
90121
mavenOptions: '$(LoggingOptions)'
91122
javaHomeOption: 'JDKVersion'
92123
jdkVersionOption: $(JavaVersion)
93124
jdkArchitectureOption: 'x64'
94125
publishJUnitResults: false
95-
goals: 'jetty:run-forked'
96-
126+
goals: 'install'
127+
97128
- task: Maven@3
98-
displayName: 'Run Tests on Java 8'
129+
displayName: 'Start Jetty'
99130
inputs:
100131
mavenPomFile: pom.xml
101-
options: '--batch-mode $(DefaultOptions) $(ProfileFlag) -Dsurefire.rerunFailingTestsCount=3 -Dparallel=classes -DthreadCount=2 -DforkCount=1C'
132+
options: '$(ProfileFlag)'
102133
mavenOptions: '$(LoggingOptions)'
103134
javaHomeOption: 'JDKVersion'
104135
jdkVersionOption: $(JavaVersion)
105136
jdkArchitectureOption: 'x64'
106137
publishJUnitResults: false
107-
goals: 'test'
138+
goals: 'jetty:run-forked'
108139

109140
- task: Maven@3
110-
displayName: 'Run Tests on Java 7'
141+
displayName: 'Run Tests on Java $(JavaVersion)'
111142
inputs:
112143
mavenPomFile: pom.xml
113144
options: '--batch-mode $(DefaultOptions) $(ProfileFlag) -Dsurefire.rerunFailingTestsCount=3 -Dparallel=classes -DthreadCount=2 -DforkCount=1C'
114145
mavenOptions: '$(LoggingOptions)'
115146
javaHomeOption: 'JDKVersion'
116-
jdkVersionOption: '1.7'
147+
jdkVersionOption: $(JavaVersion)
117148
jdkArchitectureOption: 'x64'
118149
publishJUnitResults: false
119150
goals: 'test'
120151

121-
122152
- task: PublishTestResults@2
123153
condition: succeededOrFailed()
124154
inputs:
125155
mergeTestResults: true
126156
testRunTitle: 'On Java $(JavaVersion)'
127-
128-
129-

0 commit comments

Comments
 (0)