From e5fe96ed96df94f5dca21f24662cd60bfee9af51 Mon Sep 17 00:00:00 2001
From: Zach Dworkin <zachary.dworkin@intel.com>
Date: Tue, 17 Dec 2024 11:09:37 -0800
Subject: [PATCH] contrib/intel/jenkins: Re-order stages to put slow ones first

Put slow stages first so they start executing and other tests
can complete in parallel while the slow one is running.

Signed-off-by: Zach Dworkin <zachary.dworkin@intel.com>
---
 contrib/intel/jenkins/Jenkinsfile | 70 +++++++++++++++----------------
 1 file changed, 35 insertions(+), 35 deletions(-)

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 {