From 1c3a057d3af93a6108c5cfb38b30e7bd0e1b0b04 Mon Sep 17 00:00:00 2001 From: Peter Zhu Date: Tue, 25 Jul 2023 10:35:53 -0700 Subject: [PATCH] Switch validation workflow for docker to run on AL2023 and Gradle Check to new M58xlarge runners (#3810) Signed-off-by: Peter Zhu --- jenkins/gradle/gradle-check.jenkinsfile | 6 +++++- jenkins/validate-artifacts/validate-artifacts.jenkinsfile | 4 ++-- .../validate-artifacts/validate-artifacts.jenkinsfile.txt | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/jenkins/gradle/gradle-check.jenkinsfile b/jenkins/gradle/gradle-check.jenkinsfile index 92be53dc55..2490a3d23f 100644 --- a/jenkins/gradle/gradle-check.jenkinsfile +++ b/jenkins/gradle/gradle-check.jenkinsfile @@ -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 { diff --git a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile index 9fcae55443..71db3a5357 100644 --- a/jenkins/validate-artifacts/validate-artifacts.jenkinsfile +++ b/jenkins/validate-artifacts/validate-artifacts.jenkinsfile @@ -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 = [ diff --git a/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt b/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt index ab5e59f16b..b9b400f709 100644 --- a/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt +++ b/tests/jenkins/jenkinsjob-regression-files/validate-artifacts/validate-artifacts.jenkinsfile.txt @@ -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) @@ -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)