Skip to content

Commit 84102e7

Browse files
authored
Change DevOps Maven Logging Verbosity (Azure#27122)
Change DevOps Maven Logging Verbosity
1 parent 477d32c commit 84102e7

File tree

4 files changed

+17
-12
lines changed

4 files changed

+17
-12
lines changed

eng/pipelines/code-quality-reports.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
inputs:
8484
mavenPomFile: ClientFromSourcePom.xml
8585
goals: 'install'
86-
options: '$(DefaultOptions) -T 2C -DskipTests -Dgpg.skip -DtrimStackTrace=false -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dcheckstyle.skip -Dspotbugs.skip -Drevapi.skip=true -Djacoco.skip=true --quiet'
86+
options: '$(DefaultOptions) -T 2C -DskipTests -Dgpg.skip -DtrimStackTrace=false -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dcheckstyle.skip -Dspotbugs.skip -Drevapi.skip=true -Djacoco.skip=true '
8787
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
8888
javaHomeOption: 'JDKVersion'
8989
jdkVersionOption: $(JavaBuildVersion)
@@ -99,7 +99,7 @@ jobs:
9999
# Skip failing on Checkstyle, RevApi, and Spotbugs errors.
100100
# This is being done as the error reporting will be captured, so if any error reports exist the build can be
101101
# failed later allowing all libraries to be validated.
102-
options: '$(DefaultOptions) -T 2C -Dcheckstyle.failOnViolation=false -Dcheckstyle.failsOnError=false -Dspotbugs.failOnError=false -Drevapi.failBuildOnProblemsFound=false -pl "!com.azure:azure-sdk-from-source,$(SkipLintingProjects)" --quiet'
102+
options: '$(DefaultOptions) -T 2C -Dcheckstyle.failOnViolation=false -Dcheckstyle.failsOnError=false -Dspotbugs.failOnError=false -Drevapi.failBuildOnProblemsFound=false -pl "!com.azure:azure-sdk-from-source,$(SkipLintingProjects)"'
103103
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
104104
javaHomeOption: 'JDKVersion'
105105
jdkVersionOption: $(JavaBuildVersion)

eng/pipelines/templates/jobs/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ jobs:
166166
inputs:
167167
mavenPomFile: pom.xml
168168
goals: 'deploy'
169-
options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} ${{parameters.AdditionalBuildOptions}} --quiet -DskipTests -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(System.DefaultWorkingDirectory)/build' # We include template-module so we ensure it always builds in CI
169+
options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} ${{parameters.AdditionalBuildOptions}} -DskipTests -Dgenerate-overview -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -pl $(ProjectList) -am -DaltDeploymentRepository=id::default::file://$(System.DefaultWorkingDirectory)/build' # We include template-module so we ensure it always builds in CI
170170
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
171171
javaHomeOption: 'JDKVersion'
172172
jdkVersionOption: $(JavaBuildVersion)
@@ -315,7 +315,7 @@ jobs:
315315
inputs:
316316
mavenPomFile: pom.xml
317317
goals: 'install'
318-
options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} ${{parameters.AdditionalBuildOptions}} --quiet -DskipTests $(DefaultSkipOptions) -pl $(ProjectList) -am'
318+
options: '$(DefaultOptions) -T ${{parameters.BuildParallelization}} ${{parameters.AdditionalBuildOptions}} -DskipTests $(DefaultSkipOptions) -pl $(ProjectList) -am'
319319
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
320320
javaHomeOption: 'JDKVersion'
321321
jdkVersionOption: $(JavaBuildVersion)
@@ -342,7 +342,7 @@ jobs:
342342
pool:
343343
name: azsdk-pool-mms-win-2019-general
344344
vmImage: MMS2019
345-
steps:
345+
steps:
346346
- template: /eng/common/pipelines/templates/steps/credscan.yml
347347
parameters:
348348
ServiceDirectory: ${{ parameters.ServiceDirectory }}

eng/pipelines/templates/steps/build-and-test.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ steps:
4141
displayName: 'Build for non-From Source run'
4242
inputs:
4343
mavenPomFile: pom.xml
44-
options: $(DefaultOptions) --quiet -DskipTests $(DefaultSkipOptions) -Djacoco.skip=true -T ${{ parameters.BuildParallelization }} ${{ parameters.AdditionalBuildOptions }} -pl $(ProjectList) -am
44+
options: $(DefaultOptions) -DskipTests $(DefaultSkipOptions) -Djacoco.skip=true -T ${{ parameters.BuildParallelization }} ${{ parameters.AdditionalBuildOptions }} -pl $(ProjectList) -am
4545
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
4646
javaHomeOption: 'JDKVersion'
4747
jdkVersionOption: $(JavaTestVersion)
@@ -54,7 +54,7 @@ steps:
5454
displayName: 'Run tests'
5555
inputs:
5656
mavenPomFile: pom.xml
57-
options: '$(DefaultTestOptions) --quiet -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}'
57+
options: '$(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}'
5858
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
5959
javaHomeOption: 'JDKVersion'
6060
jdkVersionOption: $(JavaTestVersion)
@@ -87,7 +87,7 @@ steps:
8787
# bloated the ci.yml files' AdditionalModules because we ended up having to list every transitive azure client
8888
# dependency. Note: The -T 1C says spin up a build thread per core. Since we're building
8989
# all the track 2, client, libraries (which is now over 100) this effectively cuts the build time in half.
90-
options: $(DefaultOptions) --quiet -DskipTests $(DefaultSkipOptions) -Djacoco.skip=true -T ${{ parameters.BuildParallelization }} ${{ parameters.AdditionalBuildOptions }}
90+
options: $(DefaultOptions) -DskipTests $(DefaultSkipOptions) -Djacoco.skip=true -T ${{ parameters.BuildParallelization }} ${{ parameters.AdditionalBuildOptions }}
9191
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
9292
javaHomeOption: 'JDKVersion'
9393
jdkVersionOption: $(JavaTestVersion)
@@ -102,9 +102,9 @@ steps:
102102
# For the "From Source" runs we don't want the -am switch as we don't care about running tests for our
103103
# dependencies, but we do want the -amd switch because we want to run tests on things that depend on us.
104104
${{ if eq(parameters.IsLiveTest, 'true') }}:
105-
options: $(DefaultTestOptions) --quiet -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}
105+
options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}
106106
${{ else }}:
107-
options: $(DefaultTestOptions) --quiet -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -amd -T ${{ parameters.TestParallelization }}
107+
options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -amd -T ${{ parameters.TestParallelization }}
108108
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
109109
javaHomeOption: 'JDKVersion'
110110
jdkVersionOption: $(JavaTestVersion)

eng/pipelines/templates/variables/globals.yml

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,19 @@ variables:
55
# This is the default Java test version. It's the version used when running tests.
66
JavaTestVersion: '1.11'
77

8+
# True if 'Enable system diagnostics' is checked when running a pipeline manually
9+
IsDebug: $[coalesce(variables['System.Debug'], 'false')]
10+
11+
# Sets the Maven log level to either the LogLevel passed in the manual pipeline run or the default 'warn'
12+
MavenLogLevel: $[coalesce(variables['LogLevel'], 'warn')]
13+
814
# Maven build/test options
915
MAVEN_CACHE_FOLDER: $(Pipeline.Workspace)/.m2/repository
1016
# See https://github.com/actions/virtual-environments/issues/1499 for more info about the wagon options
1117
# If reports about Maven dependency downloads become more common investigate re-introducing "-Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false", or other iterations of the configurations.
1218
WagonOptions: '-Dmaven.wagon.httpconnectionManager.ttlSeconds=60'
1319
DefaultOptions: '-Dmaven.repo.local=$(MAVEN_CACHE_FOLDER) --batch-mode --fail-at-end --settings eng/settings.xml $(WagonOptions)'
14-
LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=info -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
20+
LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=$(MavenLogLevel) -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
1521
MemoryOptions: '-Xmx3072m'
1622
DefaultSkipOptions: '-Dgpg.skip -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -DtrimStackTrace=false'
1723
DefaultTestOptions: '$(DefaultOptions) $(DefaultSkipOptions) -pl $(ProjectList)'
@@ -29,5 +35,4 @@ variables:
2935
AdditionalBuildOptions: ''
3036

3137
skipComponentGovernanceDetection: true
32-
IsDebug: $[coalesce(variables['System.Debug'], 'false')]
3338
Package.EnableSBOMSigning: true

0 commit comments

Comments
 (0)