Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Do not use dockerAgents on ci.adoptium.net #4931

Merged
merged 1 commit into from
Jan 16, 2024
Merged

Do not use dockerAgents on ci.adoptium.net #4931

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 7 additions & 1 deletion buildenv/jenkins/openjdk_tests
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,13 @@ 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")) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This will stop other linux test jobs using dynamic agents. Is this expected?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For RISC-V specifically, maybe limit to if ( env.JENKINS_URL.contains("ci.adoptium.net") && SPEC.equals('linux_riscv64')) ?

Copy link
Member Author

@sxa sxa Dec 27, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could do, but what other platforms do we do this for? I was under the impression it was only RISC-V and we didn't have the support for it on others

dockerAgents = null
} else {
dockerAgents = PLATFORM_MAP[params.PLATFORM]["DockerAgents"] ? PLATFORM_MAP[params.PLATFORM]["DockerAgents"] : []
}
dockerAgentLabel = ''
if (params.LABEL) {
LABEL = params.LABEL
Expand Down