Use tools version 15.3.0 in Jenkins tests

xmos · Sep 26, 2024 · 26b19e0 · 26b19e0
1 parent 196eda3
commit 26b19e0
Showing 1 changed file with 19 additions and 17 deletions.
diff --git a/Jenkinsfile b/Jenkinsfile
@@ -39,8 +39,7 @@ pipeline {
     parameters {
         string(
             name: 'TOOLS_VERSION',
-            // Dropped back from 15.3.0 on 2nd August 2024 because of http://bugzilla.xmos.local/show_bug.cgi?id=18895
-            defaultValue: '15.2.1',
+            defaultValue: '15.3.0',
             description: 'The XTC tools version'
         )
     }
@@ -71,7 +70,7 @@ pipeline {
                         cleanup {
                             xcoreCleanSandbox()
                         }
-                    } 
+                    }
                 } // Build Docs
 
                 stage('Build and Test') {
@@ -144,20 +143,23 @@ pipeline {
                         //        }
                         //    }
                         //}
-                        stage('Run RTOS Drivers HIL test') {
-                            steps {
-                                withTools(params.TOOLS_VERSION) {
-                                    withVenv {
-                                        script {
-                                            withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs ->
-                                                sh "test/rtos_drivers/hil/check_drivers_hil.sh " + adapterIDs[0]
-                                            }
-                                            sh "pytest test/rtos_drivers/hil"
-                                        }
-                                    }
-                                }
-                            }
-                        }
+                        // TODO: Disabled till http://bugzilla.xmos.local/show_bug.cgi?id=18895 is fixed.
+                        // This problem occurred in the USB tests if the HIL tests were run first.
+                        // Tools 15.3.1 should include the fix.
+                        //stage('Run RTOS Drivers HIL test') {
+                        //    steps {
+                        //        withTools(params.TOOLS_VERSION) {
+                        //            withVenv {
+                        //                script {
+                        //                    withXTAG(["$RTOS_TEST_RIG_TARGET"]) { adapterIDs ->
+                        //                        sh "test/rtos_drivers/hil/check_drivers_hil.sh " + adapterIDs[0]
+                        //                    }
+                        //                    sh "pytest test/rtos_drivers/hil"
+                        //                }
+                        //            }
+                        //        }
+                        //    }
+                        //}
                         stage('Run RTOS Drivers HIL_Add test') {
                             steps {
                                 withTools(params.TOOLS_VERSION) {