Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 1 addition & 7 deletions .buildkite/scripts/common/vm-images.json
Original file line number Diff line number Diff line change
@@ -1,13 +1,7 @@
{
"#comment": "This file lists all custom vm images. We use it to make decisions about randomized CI jobs.",
"linux": {
"ubuntu": ["ubuntu-2404", "ubuntu-2204", "ubuntu-2004"],
"debian": ["debian-12", "debian-11"],
"rhel": ["rhel-9", "rhel-8"],
"oraclelinux": ["oraclelinux-8", "oraclelinux-7"],
"rocky": ["rocky-linux-8"],
"amazonlinux": ["amazonlinux-2023"],
"opensuse": ["opensuse-leap-15"]
},
"windows": ["windows-2025", "windows-2022", "windows-2019", "windows-2016"]
"windows": ["windows-2016"]
}
15 changes: 12 additions & 3 deletions ci/unit_tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,20 @@ else {

if (Test-Path Env:BUILD_JAVA_HOME) {
if (Test-Path Env:GRADLE_OPTS) {
$env:GRADLE_OPTS=$env:GRADLE_OPTS + " " + "-Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
$env:GRADLE_OPTS=$env:GRADLE_OPTS + " -Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
} else {
$env:GRADLE_OPTS="-Dorg.gradle.java.home=" + $env:BUILD_JAVA_HOME
}
}
}

# Disable the file watcher to retain compatibility with Windows 2016
#if (Test-Path Env:GRADLE_OPTS) {
# $env:GRADLE_OPTS="$env:GRADLE_OPTS -Dorg.gradle.vfs.watch=false -Dorg.gradle.daemon=false"
#} else {
# $env:GRADLE_OPTS="-Dorg.gradle.vfs.watch=false -Dorg.gradle.daemon=false"
#}

$env:ORG_GRADLE_JVMARGS = "-Dorg.gradle.vfs.watch=false -Dorg.gradle.daemon=false"

$testOpts = "GRADLE_OPTS: $env:GRADLE_OPTS, BUILD_JAVA_HOME: $env:BUILD_JAVA_HOME"

Expand All @@ -89,7 +98,7 @@ try {
}
else {
Write-Host "~~~ Running all tests via Gradle using $testOpts"
$CIScript = ".\gradlew.bat test --console=plain --no-daemon --info"
$CIScript = ".\gradlew.bat test --console=plain --no-daemon --no-watch-fs --scan"
Invoke-Expression $CIScript
}

Expand Down