Skip to content

Commit e8c94ed

Browse files
committed
Unset JAVA_TOOL_OPTIONS when running Windows packaging tests
1 parent d31893d commit e8c94ed

4 files changed

+4
-3
lines changed

.ci/jobs.t/elastic+elasticsearch+multijob+packaging-tests-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,5 +27,5 @@
2727
mkdir %USERPROFILE%\.gradle\init.d
2828
copy .ci\init.gradle %USERPROFILE%\.gradle\init.d\
2929
(
30-
echo powershell.exe .\.ci\os.ps1 ^|^| exit /b 1
30+
echo powershell.exe .\.ci\scripts\packaging-test.ps1 ^|^| exit /b 1
3131
) | java -jar "C:\Program Files\infra\bin\runbld" --redirect-stderr -

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows-sample.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
mkdir %USERPROFILE%\.gradle\init.d
5252
copy .ci\init.gradle %USERPROFILE%\.gradle\init.d\
5353
(
54-
echo powershell.exe .\.ci\os.ps1 -GradleTasks destructiveDistroTest.%PACKAGING_TASK% ^|^| exit /b 1
54+
echo powershell.exe .\.ci\scripts\packaging-test.ps1 -GradleTasks destructiveDistroTest.%PACKAGING_TASK% ^|^| exit /b 1
5555
) | java -jar "C:\Program Files\infra\bin\runbld" --redirect-stderr -

.ci/jobs.t/elastic+elasticsearch+pull-request+packaging-tests-windows.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,5 +54,5 @@
5454
mkdir %USERPROFILE%\.gradle\init.d
5555
copy .ci\init.gradle %USERPROFILE%\.gradle\init.d\
5656
(
57-
echo powershell.exe .\.ci\os.ps1 -GradleTasks destructiveDistroTest.%PACKAGING_TASK% ^|^| exit /b 1
57+
echo powershell.exe .\.ci\scripts\packaging-test.ps1 -GradleTasks destructiveDistroTest.%PACKAGING_TASK% ^|^| exit /b 1
5858
) | java -jar "C:\Program Files\infra\bin\runbld" --redirect-stderr -

.ci/scripts/packaging-test.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ If (-NOT ([Security.Principal.WindowsPrincipal] [Security.Principal.WindowsIdent
1010
$AppProps = ConvertFrom-StringData (Get-Content .ci/java-versions.properties -raw)
1111
$env:ES_BUILD_JAVA=$AppProps.ES_BUILD_JAVA
1212
$env:ES_RUNTIME_JAVA=$AppProps.ES_RUNTIME_JAVA
13+
$env:JAVA_TOOL_OPTIONS=''
1314

1415
$ErrorActionPreference="Stop"
1516
$gradleInit = "C:\Users\$env:username\.gradle\init.d\"

0 commit comments

Comments
 (0)