Skip to content

Commit f187a00

Browse files
committed
Updated DefaultTestOptions to include tempDir setting
1 parent eb811ad commit f187a00

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ steps:
116116
$env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id
117117
$env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants
118118
119-
mvn --% -f $(Build.SourcesDirectory)/pom.xml $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Djava.io.tmpdir=$(Agent.TempDirectory) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }} ${{ parameters.TestGoals }}
119+
mvn --% -f $(Build.SourcesDirectory)/pom.xml $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }} ${{ parameters.TestGoals }}
120120
exit $LASTEXITCODE
121121
env:
122122
JAVA_HOME: $(PowerShellJavaHome)
@@ -133,7 +133,7 @@ steps:
133133
displayName: 'Run tests'
134134
inputs:
135135
mavenPomFile: pom.xml
136-
options: '$(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Djava.io.tmpdir=$(Agent.TempDirectory) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}'
136+
options: '$(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}'
137137
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
138138
javaHomeOption: 'JDKVersion'
139139
jdkVersionOption: $(JavaTestVersion)
@@ -206,7 +206,7 @@ steps:
206206
$env:AZURESUBSCRIPTION_CLIENT_ID = $account.Id
207207
$env:AZURESUBSCRIPTION_TENANT_ID = $account.Tenants
208208
209-
mvn --% -f $(Build.SourcesDirectory)/ClientFromSourcePom.xml ${{ parameters.TestGoals }} $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Djava.io.tmpdir=$(Agent.TempDirectory) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} $(LiveTestSourceParams) ${{ parameters.BuildOptions }} -T ${{ parameters.TestParallelization }}
209+
mvn --% -f $(Build.SourcesDirectory)/ClientFromSourcePom.xml ${{ parameters.TestGoals }} $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} $(LiveTestSourceParams) ${{ parameters.BuildOptions }} -T ${{ parameters.TestParallelization }}
210210
exit $LASTEXITCODE
211211
env:
212212
# PowerShellJavaHome is set in the 'Set PowerShellJavaHome'
@@ -224,9 +224,9 @@ steps:
224224
# For the "From Source" runs we don't want the -am switch as we don't care about running tests for our
225225
# dependencies, but we do want the -amd switch because we want to run tests on things that depend on us.
226226
${{ if eq(parameters.IsLiveTest, 'true') }}:
227-
options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Djava.io.tmpdir=$(Agent.TempDirectory) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}
227+
options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -T ${{ parameters.TestParallelization }}
228228
${{ else }}:
229-
options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Djava.io.tmpdir=$(Agent.TempDirectory) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -amd -T ${{ parameters.TestParallelization }}
229+
options: $(DefaultTestOptions) -DAZURE_TEST_DEBUG=$(IsDebug) -Dparallel-test-playback=${{ parameters.ParallelTestPlayback }} ${{ parameters.TestOptions }} -amd -T ${{ parameters.TestParallelization }}
230230
mavenOptions: '$(MemoryOptions) $(LoggingOptions)'
231231
javaHomeOption: 'JDKVersion'
232232
jdkVersionOption: $(JavaTestVersion)

eng/pipelines/templates/variables/globals.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ variables:
3030
LoggingOptions: '-Dorg.slf4j.simpleLogger.defaultLogLevel=$(MavenLogLevel) -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
3131
MemoryOptions: '-Xmx4096m'
3232
DefaultSkipOptions: '-Dgpg.skip -Dmaven.javadoc.skip=true -Dcodesnippet.skip=true -Dspotbugs.skip=true -Dcheckstyle.skip=true -Drevapi.skip=true -DtrimStackTrace=false -Dspotless.apply.skip=true -Dspotless.check.skip=true'
33-
DefaultTestOptions: '$(DefaultOptions) $(DefaultSkipOptions) -pl $(ProjectList)'
33+
DefaultTestOptions: '$(DefaultOptions) $(DefaultSkipOptions) -Djava.io.tmpdir=$(Agent.TempDirectory) -pl $(ProjectList)'
3434
DefaultTestMavenOptions: '$(MemoryOptions) $(LoggingOptions)'
3535
AdditionalOptions: ''
3636

0 commit comments

Comments
 (0)