[I-Build] Unify test job names to schema os-arch-javaVersion

HannesWell · HannesWell · commit 3646ab6fd4a8 · 2024-10-28T18:30:45.000+01:00
and further simplify variable interpolation.
This simplifies later additions of new os-arch combinations.
diff --git a/JenkinsJobs/AutomatedTests/I_unit_linux.groovy b/JenkinsJobs/AutomatedTests/I_unit_linux.groovy
@@ -7,7 +7,7 @@ for (JAVA_VERSION in JAVA_VERSIONS){
   def MAJOR = STREAM.split('\\.')[0]
   def MINOR = STREAM.split('\\.')[1]
 
-  pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-cen64-gtk3-java' + JAVA_VERSION){
+  pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-linux-x86_64-java' + JAVA_VERSION){
     description('Run Eclipse SDK Tests for the platform implied by this job\'s name')
     parameters { // Define parameters in job configuration to make them available from the very first build onwards
       stringParam('buildId', null, 'Build Id to test (such as I20240611-1800, N20120716-0800).')
@@ -25,7 +25,7 @@ pipeline {
   }
   agent {
     kubernetes {
-      label 'centos-unitpod&&JAVA_VERSION&&'
+      label 'centos-unitpod''' + JAVA_VERSION + ''''
       defaultContainer 'custom'
       yaml """
 apiVersion: v1
@@ -85,7 +85,7 @@ spec:
       stage('Run tests'){
           environment {
               // Declaring a jdk and ant the usual way in the 'tools' section, because of unknown reasons, breaks the usage of system commands like xvnc, pkill and sh
-              JAVA_HOME = tool(type:'jdk', name:'openjdk-jdk&&JAVA_VERSION&&-latest')
+              JAVA_HOME = tool(type:'jdk', name:'openjdk-jdk''' + JAVA_VERSION + '''-latest')
               ANT_HOME = tool(type:'ant', name:'apache-ant-latest')
               PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}"
           }
@@ -155,7 +155,7 @@ spec:
       }
   }
 }
-        '''.replace('&&JAVA_VERSION&&', JAVA_VERSION))
+        ''')
       }
     }
   }
diff --git a/JenkinsJobs/AutomatedTests/I_unit_mac.groovy b/JenkinsJobs/AutomatedTests/I_unit_mac.groovy
@@ -2,7 +2,6 @@ def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('Jenk
 def STREAMS = config.Streams
 
 def ARCHS = ['aarch64', 'x86_64']
-def ARCHS_JOB_NAME = ['aarch64': 'macM1', 'x86_64': 'mac64'] // preserve old job labels for now, to affect all downstream scripts
 def ARCHS_AGENT_LABEL = ['aarch64': 'nc1ht-macos11-arm64', 'x86_64': 'nc1ht-macos11-arm64']
 def ARCHS_JAVA_HOME = ['aarch64': '/usr/local/openjdk-17/Contents/Home', 'x86_64': '/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home']
 
@@ -11,7 +10,7 @@ for (ARCH in ARCHS){
   def MAJOR = STREAM.split('\\.')[0]
   def MINOR = STREAM.split('\\.')[1]
 
-  pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-' + ARCHS_JOB_NAME[ARCH] + '-java17'){
+  pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-macosx-' + ARCH + '-java17'){
     description('Run Eclipse SDK Tests for the platform implied by this job\'s name')
     parameters { // Define parameters in job configuration to make them available from the very first build onwards
       stringParam('buildId', null, 'Build Id to test (such as I20240611-1800, N20120716-0800).')
@@ -30,17 +29,17 @@ pipeline {
     buildDiscarder(logRotator(numToKeepStr:'5'))
   }
   agent {
-    label '&&AGENT_LABEL&&'
+    label \'''' + ARCHS_AGENT_LABEL[ARCH] + ''''
   }
 
   stages {
       stage('Run tests'){
           environment {
               // Declaring a jdk and ant the usual way in the 'tools' section, because of unknown reasons, breaks the usage of system commands like xvnc, pkill and sh
-              JAVA_HOME = '&&JAVA_HOME&&'
+              JAVA_HOME = \'''' + ARCHS_JAVA_HOME[ARCH] + ''''
               ANT_HOME = '/opt/homebrew/Cellar/ant/1.10.11/libexec'
               PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}"
-              eclipseArch = '&&ARCH&&'
+              eclipseArch = \'''' + ARCH + ''''
           }
           steps {
               cleanWs() // workspace not cleaned by default
@@ -105,7 +104,7 @@ echo -e "\\n\\tTotal elapsed time: ${TOTAL_TIME} \\n"
       }
   }
 }
-        '''.replace('&&ARCH&&', ARCH).replace('&&AGENT_LABEL&&', ARCHS_AGENT_LABEL[ARCH]).replace('&&JAVA_HOME&&', ARCHS_JAVA_HOME[ARCH]))
+        ''')
       }
     }
   }
diff --git a/JenkinsJobs/AutomatedTests/I_unit_win32.groovy b/JenkinsJobs/AutomatedTests/I_unit_win32.groovy
@@ -5,7 +5,7 @@ for (STREAM in STREAMS){
   def MAJOR = STREAM.split('\\.')[0]
   def MINOR = STREAM.split('\\.')[1]
 
-  pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-win32-java17'){
+  pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-win32-x86_64-java17'){
     description('Run Eclipse SDK Tests for the platform implied by this job\'s name')
     parameters { // Define parameters in job configuration to make them available from the very first build onwards
       stringParam('buildId', null, 'Build Id to test (such as I20240611-1800, N20120716-0800).')
diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy
@@ -417,12 +417,12 @@ spec:
 	  stage('Trigger tests'){
           steps {
             container('jnlp') {
-              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-cen64-gtk3-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-cen64-gtk3-java21', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-cen64-gtk3-java23', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-macM1-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-mac64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
-              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-win32-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-linux-x86_64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-linux-x86_64-java21', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-linux-x86_64-java23', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-macosx-aarch64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-macosx-x86_64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
+              build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-win32-x86_64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
               build job: 'Start-smoke-tests', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
             }
           }
diff --git a/cje-production/Y-build/publish.xml b/cje-production/Y-build/publish.xml
@@ -182,9 +182,15 @@
         substring="-perf-" />
     </condition>
     <!-- else normal unit tests configs -->
-    <property
-      name="testsConfigExpected"
-      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java17_macosx.cocoa.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-macM1-java17_macosx.cocoa.aarch64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java17_win32.win32.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java17_linux.gtk.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java21_linux.gtk.x86_64_21,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java24_linux.gtk.x86_64_24" />
+    <resources id="testsConfigExpected">
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java17_macosx.cocoa.x86_64_17</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-macM1-java17_macosx.cocoa.aarch64_17</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java17_win32.win32.x86_64_17</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java17_linux.gtk.x86_64_17</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java21_linux.gtk.x86_64_21</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java24_linux.gtk.x86_64_24</string>
+    </resources>
+    <pathconvert property="testsConfigExpected" refid="testsConfigExpected" pathsep="," />
 
     <condition
       property="expectedConfigFilename"
diff --git a/cje-production/scripts/publish.xml b/cje-production/scripts/publish.xml
@@ -182,9 +182,15 @@
         substring="-perf-" />
     </condition>
     <!-- else normal unit tests configs -->
-    <property
-      name="testsConfigExpected"
-      value="ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-mac64-java17_macosx.cocoa.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-macM1-java17_macosx.cocoa.aarch64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-java17_win32.win32.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java17_linux.gtk.x86_64_17,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java21_linux.gtk.x86_64_21,ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-cen64-gtk3-java23_linux.gtk.x86_64_23" />
+    <resources id="testsConfigExpected">
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-macosx-x86_64-java17_macosx.cocoa.x86_64_17</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-macosx-aarch64-java17_macosx.cocoa.aarch64_17</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-x86_64-java17_win32.win32.x86_64_17</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-linux-x86_64-java17_linux.gtk.x86_64_17</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-linux-x86_64-java21_linux.gtk.x86_64_21</string>
+      <string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-linux-x86_64-java23_linux.gtk.x86_64_23</string>
+    </resources>
+    <pathconvert property="testsConfigExpected" refid="testsConfigExpected" pathsep="," />
 
     <condition
       property="expectedConfigFilename"
diff --git a/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php b/eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php
@@ -10,9 +10,9 @@
 include("buildproperties.php");
 
 $expectedTestConfigs = array();
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-mac64-java17_macosx.cocoa.x86_64_17";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-macM1-java17_macosx.cocoa.aarch64_17";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32-java17_win32.win32.x86_64_17";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java17_linux.gtk.x86_64_17";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java21_linux.gtk.x86_64_21";
-$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-cen64-gtk3-java23_linux.gtk.x86_64_23";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-macosx-x86_64-java17_macosx.cocoa.x86_64_17";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-macosx-aarch64-java17_macosx.cocoa.aarch64_17";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32-x86_64-java17_win32.win32.x86_64_17";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-linux-x86_64-java17_linux.gtk.x86_64_17";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-linux-x86_64-java21_linux.gtk.x86_64_21";
+$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-linux-x86_64-java23_linux.gtk.x86_64_23";

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@ for (JAVA_VERSION in JAVA_VERSIONS){`
`7`	`7`	`def MAJOR = STREAM.split('\\.')[0]`
`8`	`8`	`def MINOR = STREAM.split('\\.')[1]`
`9`	`9`
`10`		`- pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-cen64-gtk3-java' + JAVA_VERSION){`
	`10`	`+ pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-linux-x86_64-java' + JAVA_VERSION){`
`11`	`11`	`description('Run Eclipse SDK Tests for the platform implied by this job\'s name')`
`12`	`12`	`parameters { // Define parameters in job configuration to make them available from the very first build onwards`
`13`	`13`	`stringParam('buildId', null, 'Build Id to test (such as I20240611-1800, N20120716-0800).')`
`@@ -25,7 +25,7 @@ pipeline {`
`25`	`25`	`}`
`26`	`26`	`agent {`
`27`	`27`	`kubernetes {`
`28`		`- label 'centos-unitpod&&JAVA_VERSION&&'`
	`28`	`+ label 'centos-unitpod''' + JAVA_VERSION + ''''`
`29`	`29`	`defaultContainer 'custom'`
`30`	`30`	`yaml """`
`31`	`31`	`apiVersion: v1`
`@@ -85,7 +85,7 @@ spec:`
`85`	`85`	`stage('Run tests'){`
`86`	`86`	`environment {`
`87`	`87`	`// Declaring a jdk and ant the usual way in the 'tools' section, because of unknown reasons, breaks the usage of system commands like xvnc, pkill and sh`
`88`		`- JAVA_HOME = tool(type:'jdk', name:'openjdk-jdk&&JAVA_VERSION&&-latest')`
	`88`	`+ JAVA_HOME = tool(type:'jdk', name:'openjdk-jdk''' + JAVA_VERSION + '''-latest')`
`89`	`89`	`ANT_HOME = tool(type:'ant', name:'apache-ant-latest')`
`90`	`90`	`PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}"`
`91`	`91`	`}`
`@@ -155,7 +155,7 @@ spec:`
`155`	`155`	`}`
`156`	`156`	`}`
`157`	`157`	`}`
`158`		`- '''.replace('&&JAVA_VERSION&&', JAVA_VERSION))`
	`158`	`+ ''')`
`159`	`159`	`}`
`160`	`160`	`}`
`161`	`161`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,6 @@ def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('Jenk`
`2`	`2`	`def STREAMS = config.Streams`
`3`	`3`
`4`	`4`	`def ARCHS = ['aarch64', 'x86_64']`
`5`		`-def ARCHS_JOB_NAME = ['aarch64': 'macM1', 'x86_64': 'mac64'] // preserve old job labels for now, to affect all downstream scripts`
`6`	`5`	`def ARCHS_AGENT_LABEL = ['aarch64': 'nc1ht-macos11-arm64', 'x86_64': 'nc1ht-macos11-arm64']`
`7`	`6`	`def ARCHS_JAVA_HOME = ['aarch64': '/usr/local/openjdk-17/Contents/Home', 'x86_64': '/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home']`
`8`	`7`
`@@ -11,7 +10,7 @@ for (ARCH in ARCHS){`
`11`	`10`	`def MAJOR = STREAM.split('\\.')[0]`
`12`	`11`	`def MINOR = STREAM.split('\\.')[1]`
`13`	`12`
`14`		`- pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-' + ARCHS_JOB_NAME[ARCH] + '-java17'){`
	`13`	`+ pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-macosx-' + ARCH + '-java17'){`
`15`	`14`	`description('Run Eclipse SDK Tests for the platform implied by this job\'s name')`
`16`	`15`	`parameters { // Define parameters in job configuration to make them available from the very first build onwards`
`17`	`16`	`stringParam('buildId', null, 'Build Id to test (such as I20240611-1800, N20120716-0800).')`
`@@ -30,17 +29,17 @@ pipeline {`
`30`	`29`	`buildDiscarder(logRotator(numToKeepStr:'5'))`
`31`	`30`	`}`
`32`	`31`	`agent {`
`33`		`- label '&&AGENT_LABEL&&'`
	`32`	`+ label \'''' + ARCHS_AGENT_LABEL[ARCH] + ''''`
`34`	`33`	`}`
`35`	`34`
`36`	`35`	`stages {`
`37`	`36`	`stage('Run tests'){`
`38`	`37`	`environment {`
`39`	`38`	`// Declaring a jdk and ant the usual way in the 'tools' section, because of unknown reasons, breaks the usage of system commands like xvnc, pkill and sh`
`40`		`- JAVA_HOME = '&&JAVA_HOME&&'`
	`39`	`+ JAVA_HOME = \'''' + ARCHS_JAVA_HOME[ARCH] + ''''`
`41`	`40`	`ANT_HOME = '/opt/homebrew/Cellar/ant/1.10.11/libexec'`
`42`	`41`	`PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}"`
`43`		`- eclipseArch = '&&ARCH&&'`
	`42`	`+ eclipseArch = \'''' + ARCH + ''''`
`44`	`43`	`}`
`45`	`44`	`steps {`
`46`	`45`	`cleanWs() // workspace not cleaned by default`
`@@ -105,7 +104,7 @@ echo -e "\\n\\tTotal elapsed time: ${TOTAL_TIME} \\n"`
`105`	`104`	`}`
`106`	`105`	`}`
`107`	`106`	`}`
`108`		`- '''.replace('&&ARCH&&', ARCH).replace('&&AGENT_LABEL&&', ARCHS_AGENT_LABEL[ARCH]).replace('&&JAVA_HOME&&', ARCHS_JAVA_HOME[ARCH]))`
	`107`	`+ ''')`
`109`	`108`	`}`
`110`	`109`	`}`
`111`	`110`	`}`