From 1e5d99549a3f9994da48af19670c5ad6c1d0f4c7 Mon Sep 17 00:00:00 2001 From: Stewart X Addison Date: Thu, 21 Dec 2023 14:24:39 +0000 Subject: [PATCH] Do not use dockerAgents on ci.adoptium.net Signed-off-by: Stewart X Addison --- buildenv/jenkins/openjdk_tests | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests index 312bca036f..e8f9084ea5 100644 --- a/buildenv/jenkins/openjdk_tests +++ b/buildenv/jenkins/openjdk_tests @@ -267,7 +267,12 @@ timestamps{ env.EXTRA_OPTIONS = params.EXTRA_OPTIONS ? params.EXTRA_OPTIONS : "" env.BUILD_LIST = params.BUILD_LIST ? params.BUILD_LIST : "" SPEC = PLATFORM_MAP[params.PLATFORM]["SPEC"] - dockerAgents = PLATFORM_MAP[params.PLATFORM]["DockerAgents"] ? PLATFORM_MAP[params.PLATFORM]["DockerAgents"] : [] + // Block dockerAgents on adoptium CI for riscv64 until we make it work + // This will allow RISC-V test jobs to queue up and not hang + if ( env.JENKINS_URL.contains("ci.adoptium.net")) { + dockerAgents = null + dockerAgents = PLATFORM_MAP[params.PLATFORM]["DockerAgents"] ? PLATFORM_MAP[params.PLATFORM]["DockerAgents"] : [] + } dockerAgentLabel = '' if (params.LABEL) { LABEL = params.LABEL