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

Switch validation workflow for docker to run on AL2023 and Gradle Check to new M58xlarge runners #3810

Merged
merged 2 commits into from
Jul 25, 2023
Merged

Switch validation workflow for docker to run on AL2023 and Gradle Check to new M58xlarge runners #3810

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fa74304
Switch validation workflow for docker to run on AL2023
peterzhuamazon Jul 25, 2023
9aff540
Add gradle check change and tests
peterzhuamazon Jul 25, 2023
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
6 changes: 5 additions & 1 deletion jenkins/gradle/gradle-check.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,10 +33,14 @@ pipeline {
// Must use agent with 1 executor or gradle check will show a lot of java-related errors
// The c524xlarge is the instance type that has the least amount of errors during gradle check
// https://github.com/opensearch-project/OpenSearch/issues/1975
//
// Update 20230724: Recent investigation shows gradle check is memory-bound thus switch to a new
// runner of M58xlarge for more stable runs
// https://github.com/opensearch-project/opensearch-ci/issues/321
choice(
name: 'AGENT_LABEL',
description: 'Choose which jenkins agent to run gradle check on',
choices: ['Jenkins-Agent-Ubuntu2004-X64-C524xlarge-Single-Host', 'Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host', 'Jenkins-Agent-Ubuntu2004-X64-M58xlarge-Single-Host'],
choices: ['Jenkins-Agent-Ubuntu2004-X64-M58xlarge-Single-Host', 'Jenkins-Agent-Windows2019-X64-C524xlarge-Single-Host', 'Jenkins-Agent-Ubuntu2004-X64-C524xlarge-Single-Host'],
)
}
triggers {
Expand Down
4 changes: 2 additions & 2 deletions jenkins/validate-artifacts/validate-artifacts.jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ def docker_args = [
]

def agent_nodes_docker = [
"x64": "Jenkins-Agent-AL2-X64-C54xlarge-Single-Host",
"arm64": "Jenkins-Agent-AL2-Arm64-C6g4xlarge-Single-Host",
"x64": "Jenkins-Agent-AL2023-X64-C54xlarge-Single-Host",
"arm64": "Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Single-Host",
]

def agent_nodes = [
Expand Down
4 changes: 2 additions & 2 deletions ...jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
validate-artifacts.echo(Validating Distribution: yum)
validate-artifacts.parallel({docker-x64=groovy.lang.Closure, tar-x64=groovy.lang.Closure, rpm-x64=groovy.lang.Closure, yum-x64=groovy.lang.Closure})
validate-artifacts.timeout({time=30}, groovy.lang.Closure)
validate-artifacts.node(Jenkins-Agent-AL2-X64-C54xlarge-Single-Host, groovy.lang.Closure)
validate-artifacts.node(Jenkins-Agent-AL2023-X64-C54xlarge-Single-Host, groovy.lang.Closure)
validate-artifacts.unstash(validate-artifacts-123)
validate-artifacts.validateArtifacts({version=2.3.0, distribution=docker, arch=x64, os-build-number=6039, osd-build-number=4104, using-staging-artifact-only=})
validateArtifacts.fileExists(/tmp/workspace/validation.sh)
Expand Down Expand Up @@ -60,7 +60,7 @@
validate-artifacts.echo(Validating Distribution: yum)
validate-artifacts.parallel({docker-arm64=groovy.lang.Closure, tar-arm64=groovy.lang.Closure, rpm-arm64=groovy.lang.Closure, yum-arm64=groovy.lang.Closure})
validate-artifacts.timeout({time=30}, groovy.lang.Closure)
validate-artifacts.node(Jenkins-Agent-AL2-Arm64-C6g4xlarge-Single-Host, groovy.lang.Closure)
validate-artifacts.node(Jenkins-Agent-AL2023-Arm64-C6g4xlarge-Single-Host, groovy.lang.Closure)
validate-artifacts.unstash(validate-artifacts-123)
validate-artifacts.validateArtifacts({version=2.3.0, distribution=docker, arch=arm64, os-build-number=6039, osd-build-number=4104, using-staging-artifact-only=})
validateArtifacts.fileExists(/tmp/workspace/validation.sh)
Expand Down