No commit message

Juee14Desai · Jun 25, 2024 · 7a1df71 · 7a1df71
1 parent bd4da6e
commit 7a1df71
Showing 1 changed file with 26 additions and 26 deletions.
diff --git a/contrib/intel/jenkins/Jenkinsfile b/contrib/intel/jenkins/Jenkinsfile
@@ -162,7 +162,7 @@ def checkout_ci_resources() {
       rm -rf ${env.WORKSPACE}/ci_resources && mkdir ${env.WORKSPACE}/ci_resources
     fi
 
-    git clone ${env.CI_RESOURCES} ${env.WORKSPACE}/ci_resources
+    git clone -b master ${env.JDESAI_CI_RESOURCES} ${env.WORKSPACE}/ci_resources
 
   """
 }
@@ -175,7 +175,7 @@ def checkout_ci() {
       rm -rf ${env.WORKSPACE}/ci && mkdir ${env.WORKSPACE}/ci
     fi
 
-    git clone --recurse-submodules ${env.CI} ${env.WORKSPACE}/ci
+    git clone -b master --recurse-submodules ${env.JDESAI_CI} ${env.WORKSPACE}/ci
   """
 }
 
@@ -501,7 +501,7 @@ pipeline {
             }
           }
         }
-        stage ('build-daos') {
+        /*stage ('build-daos') {
           agent {
             node {
               label 'daos_head'
@@ -520,8 +520,8 @@ pipeline {
               }
             }
           }
-        }
-        stage ('build-gpu') {
+        }*/
+        /*stage ('build-gpu') {
           agent {
             node {
               label 'ze'
@@ -541,13 +541,13 @@ pipeline {
               }
             }
           }
-        }
+        }*/
       }
     }
     stage('parallel-tests') {
       when { equals expected: true, actual: DO_RUN }
       parallel {
-        stage ('CI_MPI_verbs-rxm_IMB') {
+        /*stage ('CI_MPI_verbs-rxm_IMB') {
           environment {
             build_type = "water"
           }
@@ -594,7 +594,7 @@ pipeline {
               }
             }
           }
-        }
+        }*/
         stage('tcp') {
            steps {
             script {
@@ -737,27 +737,27 @@ pipeline {
             }
           }
         }
-	      stage ('oneCCL') {
+	      /*stage ('oneCCL') {
           steps {
             script {
               dir (RUN_LOCATION) {
-		            run_middleware([["verbs", null]], "oneCCL",
+		            /*run_middleware([["verbs", null]], "oneCCL",
                                "oneccl", "water", "squirtle,totodile", "2")
 		            run_middleware([["shm", null]], "oneCCL",
 			                         "oneccl", "grass", "bulbasaur", "1")
 		            run_middleware([["psm3", null]], "oneCCL",
-			                         "oneccl", "water", "squirtle", "2")
-		            run_middleware([["tcp", null]], "oneCCL",
-			                         "oneccl", "grass", "bulbasaur", "2")
-                run_middleware([["shm", null]], "oneCCL_DSA",
+			                         "oneccl", "water", "squirtle", "2")*/
+		            run_middleware([["ucx", null]], "oneCCL",
+			                         "oneccl", "ucx", "totodile", "2")
+                /*run_middleware([["shm", null]], "oneCCL_DSA",
                                "oneccl", "electric", "pikachu", "1", null, null,
                                """CCL_ATL_SHM=1 FI_SHM_DISABLE_CMA=1 \
-                               FI_SHM_USE_DSA_SAR=1 FI_LOG_LEVEL=warn""")
+                               FI_SHM_USE_DSA_SAR=1 FI_LOG_LEVEL=warn""")*/
               }
             }
           }
-        }
-        stage ('oneCCL-GPU-v3') {
+        }*/
+        /*stage ('oneCCL-GPU-v3') {
           agent { node { label 'ze' } }
           options { skipDefaultCheckout() }
           steps {
@@ -778,8 +778,8 @@ pipeline {
               }
             }
           }
-        }
-        stage('daos_tcp') {
+        }*/
+        /*stage('daos_tcp') {
           agent { node { label 'daos_tcp' } }
           options { skipDefaultCheckout() }
           steps {
@@ -792,8 +792,8 @@ pipeline {
               }
             }
           }
-        }
-         stage('daos_verbs') {
+        }*/
+         /*stage('daos_verbs') {
           agent { node { label 'daos_verbs' } }
           options { skipDefaultCheckout() }
           steps {
@@ -806,8 +806,8 @@ pipeline {
               }
             }
           }
-        }
-        stage ('DMABUF-Tests') {
+        }*/
+        /*stage ('DMABUF-Tests') {
           agent { node { label 'ze' } }
           options { skipDefaultCheckout() }
           steps {
@@ -821,7 +821,7 @@ pipeline {
               }
             }
           }
-        }
+        }*/
         stage ('cuda-shm-v1') {
           steps {
             script {
@@ -850,7 +850,7 @@ pipeline {
             }
           }
         }
-        stage ('ze-shm-v3') {
+        /*stage ('ze-shm-v3') {
           agent { node { label 'ze' } }
           options { skipDefaultCheckout() }
           steps {
@@ -865,7 +865,7 @@ pipeline {
               }
             }
           }
-        }
+        }*/
         stage('dsa') {
           when { equals expected: true, actual: DO_RUN }
           steps {