diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index a28d420af65..1b830c3ae4a 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -428,40 +428,28 @@ pipeline { } } } - stage ('parallel-builds') { + stage ('build-libfabric') { when { equals expected: true, actual: DO_RUN } parallel { - stage ('build-water') { + stage ('water') { steps { script { dir (CI_LOCATION) { run_ci("pre-build", "pr_build_water.json") - run_ci("pre-build", "pr_build_shmem_water.json") - slurm_batch("totodile", "1", - "${env.LOG_DIR}/build_mpich_water_log", - """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \ - --build_item=mpich --build_hw=water""" - ) } } } } - stage ('build-grass') { + stage ('grass') { steps { script { dir (CI_LOCATION) { run_ci("pre-build", "pr_build_grass.json") - run_ci("pre-build", "pr_build_shmem_grass.json") - slurm_batch("grass", "1", - "${env.LOG_DIR}/build_mpich_grass_log", - """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \ - --build_item=mpich --build_hw=grass""" - ) } } } } - stage ('build-electric') { + stage ('electric') { steps { script { dir (CI_LOCATION) { @@ -470,7 +458,7 @@ pipeline { } } } - stage ('build-ucx') { + stage ('ucx') { steps { script { dir (CI_LOCATION) { @@ -479,7 +467,7 @@ pipeline { } } } - stage ('build-cyndaquil') { + stage ('cyndaquil') { steps { script { dir (CI_LOCATION) { @@ -488,7 +476,7 @@ pipeline { } } } - stage ('build-quilava') { + stage ('quilava') { steps { script { dir (CI_LOCATION) { @@ -497,7 +485,7 @@ pipeline { } } } - stage ('build-ivysaur') { + stage ('ivysaur') { steps { script { dir (CI_LOCATION) { @@ -506,7 +494,7 @@ pipeline { } } } - stage ('build-daos') { + stage ('daos') { agent { node { label 'daos_head' @@ -528,7 +516,7 @@ pipeline { } } } - stage ('build-fire') { + stage ('fire') { agent { node { label 'ze' @@ -553,6 +541,55 @@ pipeline { } } } + stage('build-middlewares') { + when { equals expected: true, actual: DO_RUN } + parallel { + stage ('shmem-water') { + steps { + script { + dir (CI_LOCATION) { + run_ci("pre-build", "pr_build_shmem_water.json") + } + } + } + } + stage ('shmem-grass') { + steps { + script { + dir (CI_LOCATION) { + run_ci("pre-build", "pr_build_shmem_grass.json") + } + } + } + } + stage ('mpich-water') { + steps { + script { + dir (CI_LOCATION) { + slurm_batch("totodile", "1", + "${env.LOG_DIR}/build_mpich_water_log", + """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \ + --build_item=mpich --build_hw=water""" + ) + } + } + } + } + stage ('mpich-grass') { + steps { + script { + dir (CI_LOCATION) { + slurm_batch("grass", "1", + "${env.LOG_DIR}/build_mpich_grass_log", + """python$PYTHON_VERSION ${RUN_LOCATION}/build.py \ + --build_item=mpich --build_hw=grass""" + ) + } + } + } + } + } + } stage('parallel-tests') { when { equals expected: true, actual: DO_RUN } parallel {