commit 027e869cbaf70ae46086ff6d0ab37ba8cd1106ff
author Jonatan Antoni <jonatan.antoni@arm.com> Mon Oct 31 13:37:25 2022 +0100
committer GitHub <noreply@github.com> Mon Oct 31 13:37:25 2022 +0100
tree d04270962caa3c2a53923395210f0bcbd325ae8b
parent 085ec6abdf59816a9151a9e4ff7b55617c680873

Jenkins: Fix CoreValidation stage

Jenkinsfile

diff --git a/Jenkinsfile b/Jenkinsfile
index c462376..9e182d0 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -52,8 +52,9 @@
 
 CONFIGURATIONS = [
     'pre_commit': [
-        'mdevices': ['CM0', 'CM3', 'CM4FP', 'CM7DP', 'CM23', 'CM33NS', 'CM35PS', 'CM55NS'],
-        'adevices': ['CA7', 'CA9neon'],
+        'mdevices': ['CM0', 'CM3', 'CM4FP', 'CM7DP', 'CM23', 'CM33NS', 'CM35PS',
+            'CM55NS', 'CM85S'],
+        'adevices': ['CA7', 'CA9'],
         'devices' : [],
         'configs' : [
             'AC5': ['low', 'tiny'],
@@ -64,9 +65,10 @@
     ],
     'post_commit': [
         'devices' : ['CM0', 'CM0plus', 'CM3', 'CM4', 'CM4FP', 'CM7', 'CM7SP', 'CM7DP',
-             'CM23', 'CM23S', 'CM23NS', 'CM33', 'CM33S', 'CM33NS',
-             'CM35P', 'CM35PS', 'CM35PNS', 'CM55', 'CM55S', 'CM55NS',
-             'CA5', 'CA5neon', 'CA7', 'CA7neon', 'CA9', 'CA9neon'],
+            'CM23', 'CM23S', 'CM23NS', 'CM33', 'CM33S', 'CM33NS',
+            'CM35P', 'CM35PS', 'CM35PNS', 'CM55', 'CM55S', 'CM55NS',
+            'CM85S', 'CM85NS',
+            'CA5', 'CA7', 'CA9'],
         'configs' : [
             'AC5': ['low', 'tiny'],
             'AC6': ['low', 'tiny'],
@@ -76,9 +78,10 @@
     ],
     'nightly': [
         'devices' : ['CM0', 'CM0plus', 'CM3', 'CM4', 'CM4FP', 'CM7', 'CM7SP', 'CM7DP',
-                     'CM23', 'CM23S', 'CM23NS', 'CM33', 'CM33S', 'CM33NS',
-                     'CM35P', 'CM35PS', 'CM35PNS', 'CM55', 'CM55S', 'CM55NS',
-                     'CA5', 'CA5neon', 'CA7', 'CA7neon', 'CA9', 'CA9neon'],
+            'CM23', 'CM23S', 'CM23NS', 'CM33', 'CM33S', 'CM33NS',
+            'CM35P', 'CM35PS', 'CM35PNS', 'CM55', 'CM55S', 'CM55NS',
+            'CM85S', 'CM85NS',
+            'CA5', 'CA7', 'CA9'],
         'configs' : [
             'AC5': ['low', 'mid', 'high', 'size', 'tiny'],
             'AC6': ['low', 'mid', 'high', 'size', 'tiny'],
@@ -383,7 +386,7 @@
                         }
                         steps {
                             checkoutScmWithRetry(3)
-                            dir('CMSIS/CoreValidation/Tests') {
+                            dir('CMSIS/CoreValidation/Project') {
                                 script {
                                     CONFIGURATION['configs'].each { COMPILER, OPTS ->
                                         tee("CV_${COMPILER}_${DEVICE}.log") {