diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile index cdc29596028..3e176da7d06 100644 --- a/contrib/intel/jenkins/Jenkinsfile +++ b/contrib/intel/jenkins/Jenkinsfile @@ -605,6 +605,41 @@ pipeline { stage('parallel-tests') { when { equals expected: true, actual: DO_RUN } parallel { + stage('mpichtestsuite-tcp') { + steps { + script { + dir (RUN_LOCATION) { + def providers = [['tcp', null]] + def MPIS = ["mpich"] + if (env.WEEKLY.toBoolean()) { + MPIS = ["impi", "mpich"] + } + for (def mpi in MPIS) { + run_middleware(providers, "mpichtestsuite", "mpichtestsuite", + "grass", "bulbasaur,ivysaur", "2", "${mpi}") + } + } + } + } + } + stage('mpichtestsuite-verbs') { + steps { + script { + dir (RUN_LOCATION) { + def providers = [["verbs","rxm"]] + def MPIS = ["mpich"] + if (env.WEEKLY.toBoolean()) { + MPIS = ["impi", "mpich"] + } + for (def mpi in MPIS) { + run_middleware(providers, "mpichtestsuite", "mpichtestsuite", + "water", "squirtle,wartortle,articuno", "2", + "${mpi}") + } + } + } + } + } stage ('CI_mpi_verbs-rxm_imb') { steps { script { @@ -756,41 +791,6 @@ pipeline { } } } - stage('mpichtestsuite-tcp') { - steps { - script { - dir (RUN_LOCATION) { - def providers = [['tcp', null]] - def MPIS = ["mpich"] - if (env.WEEKLY.toBoolean()) { - MPIS = ["impi", "mpich"] - } - for (def mpi in MPIS) { - run_middleware(providers, "mpichtestsuite", "mpichtestsuite", - "grass", "bulbasaur,ivysaur", "2", "${mpi}") - } - } - } - } - } - stage('mpichtestsuite-verbs') { - steps { - script { - dir (RUN_LOCATION) { - def providers = [["verbs","rxm"]] - def MPIS = ["mpich"] - if (env.WEEKLY.toBoolean()) { - MPIS = ["impi", "mpich"] - } - for (def mpi in MPIS) { - run_middleware(providers, "mpichtestsuite", "mpichtestsuite", - "water", "squirtle,wartortle,articuno", "2", - "${mpi}") - } - } - } - } - } stage('SHMEM_grass') { steps { script {