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

contrib/intel/jenkins: Split jobs across nodes better & fail run_ci using script exit #10272

Merged
merged 2 commits into from
Aug 5, 2024
Merged

contrib/intel/jenkins: Split jobs across nodes better & fail run_ci using script exit #10272

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ad04ecc
contrib/intel/jenkins: Let script fail instead of using return
zachdworkin Aug 2, 2024
8defbbf
contrib/intel/jenkins: Let grass tests choose between two partitions
zachdworkin Aug 2, 2024
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
25 changes: 12 additions & 13 deletions contrib/intel/jenkins/Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,13 +94,11 @@ def run_middleware(providers, stage_name, test, hw, partition, node_num,
}

def run_ci(stage_name, config_name) {
return sh(returnStatus: true,
script: """source ${CI_LOCATION}/${env.CI_MODULE}/venv/bin/activate;\
python run.py \
--output=${env.LOG_DIR}/${stage_name} \
--job=${config_name}
"""
)
sh """source ${CI_LOCATION}/${env.CI_MODULE}/venv/bin/activate;\
python run.py \
--output=${env.LOG_DIR}/${stage_name} \
--job=${config_name}
"""
}

def gather_logs(cluster, key, dest, source) {
Expand Down Expand Up @@ -715,7 +713,7 @@ pipeline {
script {
dir (RUN_LOCATION) {
run_middleware([["tcp", null]], "SHMEM", "shmem",
"grass", "grass", "2")
"grass", "bulbasaur,chikorita", "2")
}
}
}
Expand All @@ -735,9 +733,10 @@ pipeline {
script {
dir (RUN_LOCATION) {
run_middleware([["tcp", null],["sockets", null]],
"multinode_performance", "multinode", "grass", "grass", "2")
run_middleware([["verbs", "rxm"]], "multinode_performance",
"multinode", "water", "totodile", "2")
"multinode_performance", "multinode", "grass",
"bulbasaur,chikorita", "2")
run_middleware([["verbs", "rxm"]], "multinode_performance",
"multinode", "water", "totodile", "2")
}
}
}
Expand All @@ -749,11 +748,11 @@ pipeline {
run_middleware([["verbs", null]], "oneCCL",
"oneccl", "water", "totodile", "2")
run_middleware([["shm", null]], "oneCCL",
"oneccl", "grass", "bulbasaur", "1")
"oneccl", "grass", "bulbasaur,chikorita", "1")
run_middleware([["psm3", null]], "oneCCL",
"oneccl", "water", "totodile", "2")
run_middleware([["tcp", null]], "oneCCL",
"oneccl", "grass", "bulbasaur", "2")
"oneccl", "grass", "bulbasaur,chikorita", "2")
run_middleware([["shm", null]], "oneCCL_DSA",
"oneccl", "electric", "pikachu", "1", null, null,
"""CCL_ATL_SHM=1 FI_SHM_DISABLE_CMA=1 \
Expand Down
Loading