From 1df5f209fddbf4e6c9266da6c77196679930c1fc Mon Sep 17 00:00:00 2001 From: Hannes Wellmann Date: Tue, 30 Apr 2024 22:59:55 +0200 Subject: [PATCH] [I-Build-Tests] Merge multiple definitions into one per OS --- ...java21.groovy => I_unit_cen64_gtk3.groovy} | 14 +- .../I_unit_cen64_gtk3_java17.groovy | 160 ------------------ .../I_unit_cen64_gtk3_java23.groovy | 160 ------------------ .../AutomatedTests/I_unit_mac64_java17.groovy | 106 ------------ ...java17.groovy => I_unit_mac_java17.groovy} | 20 ++- .../AutomatedTests/I_unit_win32_java17.groovy | 3 +- JenkinsJobs/Builds/I_build.groovy | 4 +- 7 files changed, 24 insertions(+), 443 deletions(-) rename JenkinsJobs/AutomatedTests/{I_unit_cen64_gtk3_java21.groovy => I_unit_cen64_gtk3.groovy} (94%) delete mode 100644 JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java17.groovy delete mode 100644 JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java23.groovy delete mode 100644 JenkinsJobs/AutomatedTests/I_unit_mac64_java17.groovy rename JenkinsJobs/AutomatedTests/{I_unit_macM1_java17.groovy => I_unit_mac_java17.groovy} (81%) diff --git a/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java21.groovy b/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3.groovy similarity index 94% rename from JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java21.groovy rename to JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3.groovy index e58ebe61b1c..3ec03c17b3b 100644 --- a/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java21.groovy +++ b/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3.groovy @@ -1,11 +1,12 @@ def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JenkinsJobs/JobDSL.json')) def STREAMS = config.Streams +def JAVA_VERSIONS = ['17', '21', '23'] for (STREAM in STREAMS){ - def MAJOR = STREAM.split('\\.')[0] - def MINOR = STREAM.split('\\.')[1] +for (JAVA_VERSION in JAVA_VERSIONS){ + def (MAJOR, MINOR) = STREAM.split('\\.') - pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-cen64-gtk3-java21'){ + pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-cen64-gtk3-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).') @@ -23,7 +24,7 @@ pipeline { } agent { kubernetes { - label 'centos-unitpod21' + label 'centos-unitpod&&JAVA_VERSION&&' defaultContainer 'custom' yaml """ apiVersion: v1 @@ -83,7 +84,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-jdk21-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}" } @@ -153,8 +154,9 @@ spec: } } } - ''') + '''.replace('&&JAVA_VERSION&&', JAVA_VERSION)) } } } } +} diff --git a/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java17.groovy b/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java17.groovy deleted file mode 100644 index abc5114e088..00000000000 --- a/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java17.groovy +++ /dev/null @@ -1,160 +0,0 @@ -def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JenkinsJobs/JobDSL.json')) -def STREAMS = config.Streams - -for (STREAM in STREAMS){ - def MAJOR = STREAM.split('\\.')[0] - def MINOR = STREAM.split('\\.')[1] - - pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-cen64-gtk3-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).') - } - - definition { - cps { - sandbox() - script(''' -pipeline { - options { - timeout(time: 600, unit: 'MINUTES') - timestamps() - buildDiscarder(logRotator(numToKeepStr:'5')) - } - agent { - kubernetes { - label 'centos-unitpod17' - defaultContainer 'custom' - yaml """ -apiVersion: v1 -kind: Pod -spec: - containers: - - name: "jnlp" - resources: - limits: - memory: "2048Mi" - cpu: "2000m" - requests: - memory: "512Mi" - cpu: "1000m" - - name: "custom" - image: "eclipse/platformreleng-centos-gtk3-metacity:8" - imagePullPolicy: "Always" - resources: - limits: - memory: "4096Mi" - cpu: "1000m" - requests: - # memory needs to be at least 1024Mi, see https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/2478 - memory: "1024Mi" - cpu: "1000m" - securityContext: - privileged: false - tty: true - command: - - cat - volumeMounts: - - mountPath: "/opt/tools" - name: "volume-0" - readOnly: false - workingDir: "/home/jenkins/agent" - nodeSelector: {} - restartPolicy: "Never" - volumes: - - name: "volume-0" - persistentVolumeClaim: - claimName: "tools-claim-jiro-releng" - readOnly: true - - configMap: - name: "known-hosts" - name: "volume-1" - - emptyDir: - medium: "" - name: "workspace-volume" - - emptyDir: - medium: "" - name: "volume-3" -""" - } - } - - 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 = tool(type:'jdk', name:'openjdk-jdk17-latest') - ANT_HOME = tool(type:'ant', name:'apache-ant-latest') - PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}" - } - steps { - container ('custom'){ - xvnc(useXauthority: true) { - sh \'\'\'#!/bin/bash -x - - buildId=$(echo $buildId|tr -d ' ') - RAW_DATE_START="$(date +%s )" - - export LANG=en_US.UTF-8 - cat /etc/*release - echo -e "\\n\\tRAW Date Start: ${RAW_DATE_START} \\n" - echo -e "\\n\\t whoami: $( whoami )\\n" - echo -e "\\n\\t uname -a: $(uname -a)\\n" - - # 0002 is often the default for shell users, but it is not when ran from - # a cron job, so we set it explicitly, to be sure of value, so releng group has write access to anything - # we create on shared area. - oldumask=$(umask) - umask 0002 - - echo "umask explicitly set to 0002, old value was $oldumask" - - # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it. - mkdir -p ${WORKSPACE}/tmp - - wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose --no-check-certificate https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1 - wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource - cat ${WORKSPACE}/buildproperties.shsource - source ${WORKSPACE}/buildproperties.shsource - - echo JAVA_HOME: $JAVA_HOME - echo ANT_HOME: $ANT_HOME - echo PATH: $PATH - export ANT_OPTS="${ANT_OPTS} -Djava.io.tmpdir=${WORKSPACE}/tmp" - - env 1>envVars.txt 2>&1 - ant -diagnostics 1>antDiagnostics.txt 2>&1 - java -XshowSettings -version 1>javaSettings.txt 2>&1 - - ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -DeclipseStream=$STREAM -DEBUILDER_HASH=${EBUILDER_HASH} \\ - -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} \\ - -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\ - -DtestSuite=all \\ - -Djvm=${JAVA_HOME}/bin/java - - RAW_DATE_END="$(date +%s )" - - echo -e "\\n\\tRAW Date End: ${RAW_DATE_END} \\n" - - TOTAL_TIME=$((${RAW_DATE_END} - ${RAW_DATE_START})) - - echo -e "\\n\\tTotal elapsed time: ${TOTAL_TIME} \\n" - \'\'\' - } - } - archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt' - junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml' - build job: 'Releng/ep-collectResults', wait: false, parameters: [ - string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), - string(name: 'buildURL', value: "${BUILD_URL}"), - string(name: 'buildID', value: "${params.buildId}") - ] - } - } - } -} - ''') - } - } - } -} diff --git a/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java23.groovy b/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java23.groovy deleted file mode 100644 index 208a76e7633..00000000000 --- a/JenkinsJobs/AutomatedTests/I_unit_cen64_gtk3_java23.groovy +++ /dev/null @@ -1,160 +0,0 @@ -def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JenkinsJobs/JobDSL.json')) -def STREAMS = config.Streams - -for (STREAM in STREAMS){ - def MAJOR = STREAM.split('\\.')[0] - def MINOR = STREAM.split('\\.')[1] - - pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-cen64-gtk3-java23'){ - 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).') - } - - definition { - cps { - sandbox() - script(''' -pipeline { - options { - timeout(time: 600, unit: 'MINUTES') - timestamps() - buildDiscarder(logRotator(numToKeepStr:'5')) - } - agent { - kubernetes { - label 'centos-unitpod23' - defaultContainer 'custom' - yaml """ -apiVersion: v1 -kind: Pod -spec: - containers: - - name: "jnlp" - resources: - limits: - memory: "2048Mi" - cpu: "2000m" - requests: - memory: "512Mi" - cpu: "1000m" - - name: "custom" - image: "eclipse/platformreleng-centos-gtk3-metacity:8" - imagePullPolicy: "Always" - resources: - limits: - memory: "4096Mi" - cpu: "1000m" - requests: - # memory needs to be at least 1024Mi, see https://gitlab.eclipse.org/eclipsefdn/helpdesk/-/issues/2478 - memory: "1024Mi" - cpu: "1000m" - securityContext: - privileged: false - tty: true - command: - - cat - volumeMounts: - - mountPath: "/opt/tools" - name: "volume-0" - readOnly: false - workingDir: "/home/jenkins/agent" - nodeSelector: {} - restartPolicy: "Never" - volumes: - - name: "volume-0" - persistentVolumeClaim: - claimName: "tools-claim-jiro-releng" - readOnly: true - - configMap: - name: "known-hosts" - name: "volume-1" - - emptyDir: - medium: "" - name: "workspace-volume" - - emptyDir: - medium: "" - name: "volume-3" -""" - } - } - - 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 = tool(type:'jdk', name:'openjdk-jdk23-latest') - ANT_HOME = tool(type:'ant', name:'apache-ant-latest') - PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}" - } - steps { - container ('custom'){ - xvnc(useXauthority: true) { - sh \'\'\'#!/bin/bash -x - - buildId=$(echo $buildId|tr -d ' ') - RAW_DATE_START="$(date +%s )" - - export LANG=en_US.UTF-8 - cat /etc/*release - echo -e "\\n\\tRAW Date Start: ${RAW_DATE_START} \\n" - echo -e "\\n\\t whoami: $( whoami )\\n" - echo -e "\\n\\t uname -a: $(uname -a)\\n" - - # 0002 is often the default for shell users, but it is not when ran from - # a cron job, so we set it explicitly, to be sure of value, so releng group has write access to anything - # we create on shared area. - oldumask=$(umask) - umask 0002 - - echo "umask explicitly set to 0002, old value was $oldumask" - - # we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it. - mkdir -p ${WORKSPACE}/tmp - - wget -O ${WORKSPACE}/getEBuilder.xml --no-verbose --no-check-certificate https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1 - wget -O ${WORKSPACE}/buildproperties.shsource --no-check-certificate https://download.eclipse.org/eclipse/downloads/drops4/${buildId}/buildproperties.shsource - cat ${WORKSPACE}/buildproperties.shsource - source ${WORKSPACE}/buildproperties.shsource - - echo JAVA_HOME: $JAVA_HOME - echo ANT_HOME: $ANT_HOME - echo PATH: $PATH - export ANT_OPTS="${ANT_OPTS} -Djava.io.tmpdir=${WORKSPACE}/tmp -Djava.security.manager=allow" - - env 1>envVars.txt 2>&1 - ant -diagnostics 1>antDiagnostics.txt 2>&1 - java -XshowSettings -version 1>javaSettings.txt 2>&1 - - ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -DeclipseStream=$STREAM -DEBUILDER_HASH=${EBUILDER_HASH} \\ - -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} \\ - -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 \\ - -DtestSuite=all \\ - -Djvm=${JAVA_HOME}/bin/java - - RAW_DATE_END="$(date +%s )" - - echo -e "\\n\\tRAW Date End: ${RAW_DATE_END} \\n" - - TOTAL_TIME=$((${RAW_DATE_END} - ${RAW_DATE_START})) - - echo -e "\\n\\tTotal elapsed time: ${TOTAL_TIME} \\n" - \'\'\' - } - } - archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt' - junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml' - build job: 'Releng/ep-collectResults', wait: false, parameters: [ - string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), - string(name: 'buildURL', value: "${BUILD_URL}"), - string(name: 'buildID', value: "${params.buildId}") - ] - } - } - } -} - ''') - } - } - } -} diff --git a/JenkinsJobs/AutomatedTests/I_unit_mac64_java17.groovy b/JenkinsJobs/AutomatedTests/I_unit_mac64_java17.groovy deleted file mode 100644 index 188cb582e72..00000000000 --- a/JenkinsJobs/AutomatedTests/I_unit_mac64_java17.groovy +++ /dev/null @@ -1,106 +0,0 @@ -def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JenkinsJobs/JobDSL.json')) -def STREAMS = config.Streams - -for (STREAM in STREAMS){ - def MAJOR = STREAM.split('\\.')[0] - def MINOR = STREAM.split('\\.')[1] - - pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-mac64-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).') - } - - authenticationToken('windows2012tests') - - definition { - cps { - sandbox() - script(''' -pipeline { - options { - timeout(time: 600, unit: 'MINUTES') - timestamps() - buildDiscarder(logRotator(numToKeepStr:'5')) - } - agent { - label 'nc1ht-macos11-arm64' - } - - 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 = '/Library/Java/JavaVirtualMachines/temurin-17.jdk/Contents/Home' - ANT_HOME = '/opt/homebrew/Cellar/ant/1.10.11/libexec' - PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}" - eclipseArch = 'x86_64' - } - steps { - cleanWs() // workspace not cleaned by default - sh \'\'\'#!/bin/bash -x -RAW_DATE_START="$(date +%s )" - -echo -e "\\n\\tRAW Date Start: ${RAW_DATE_START} \\n" - -echo -e "\\n\\t whoami: $( whoami )\\n" -echo -e "\\n\\t uname -a: $(uname -a)\\n" - -# unset commonly defined system variables, which we either do not need, or want to set ourselves. -# (this is to improve consistency running on one machine versus another) -echo "Unsetting variables: JAVA_BINDIR JAVA_ROOT JDK_HOME JRE_HOME CLASSPATH" -unset -v JAVA_BINDIR JAVA_ROOT JDK_HOME JRE_HOME CLASSPATH - -# 0002 is often the default for shell users, but it is not when ran from -# a cron job, so we set it explicitly, to be sure of value, so releng group has write access to anything -# we create on shared area. -oldumask=$(umask) -umask 0002 -echo "umask explicitly set to 0002, old value was $oldumask" - -# we want java.io.tmpdir to be in $WORKSPACE, but must already exist, for Java to use it. -mkdir -p tmp - -curl -o getEBuilder.xml https://download.eclipse.org/eclipse/relengScripts/production/testScripts/hudsonBootstrap/getEBuilder.xml 2>&1 -cat getEBuilder.xml -curl -o buildProperties.sh https://download.eclipse.org/eclipse/downloads/drops4/$buildId/buildproperties.shsource -cat getEBuilder.xml -source buildProperties.sh - -echo JAVA_HOME: $JAVA_HOME -echo ANT_HOME: $ANT_HOME -echo PATH: $PATH - -env 1>envVars.txt 2>&1 -ant -diagnostics 1>antDiagnostics.txt 2>&1 -java -XshowSettings -version 1>javaSettings.txt 2>&1 - -ant -f getEBuilder.xml -Djava.io.tmpdir=${WORKSPACE}/tmp -DbuildId=$buildId -DeclipseStream=$STREAM -DEBUILDER_HASH=${EBUILDER_HASH} \\ - -DdownloadURL=https://download.eclipse.org/eclipse/downloads/drops4/${buildId} \\ - -Dosgi.os=macosx -Dosgi.ws=cocoa -Dosgi.arch=${eclipseArch} \\ - -DtestSuite=all - -RAW_DATE_END="$(date +%s )" - -echo -e "\\n\\tRAW Date End: ${RAW_DATE_END} \\n" - -TOTAL_TIME=$((${RAW_DATE_END} - ${RAW_DATE_START})) - -echo -e "\\n\\tTotal elapsed time: ${TOTAL_TIME} \\n" - \'\'\' - archiveArtifacts '**/eclipse-testing/results/**, **/eclipse-testing/directorLogs/**, *.properties, *.txt' - junit keepLongStdio: true, testResults: '**/eclipse-testing/results/xml/*.xml' - build job: 'Releng/ep-collectResults', wait: false, parameters: [ - string(name: 'triggeringJob', value: "${JOB_BASE_NAME}"), - string(name: 'buildURL', value: "${BUILD_URL}"), - string(name: 'buildID', value: "${params.buildId}") - ] - } - } - } -} - ''') - } - } - } -} diff --git a/JenkinsJobs/AutomatedTests/I_unit_macM1_java17.groovy b/JenkinsJobs/AutomatedTests/I_unit_mac_java17.groovy similarity index 81% rename from JenkinsJobs/AutomatedTests/I_unit_macM1_java17.groovy rename to JenkinsJobs/AutomatedTests/I_unit_mac_java17.groovy index 0745929b71d..b0e32393590 100644 --- a/JenkinsJobs/AutomatedTests/I_unit_macM1_java17.groovy +++ b/JenkinsJobs/AutomatedTests/I_unit_mac_java17.groovy @@ -1,11 +1,16 @@ def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JenkinsJobs/JobDSL.json')) 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'] + for (STREAM in STREAMS){ - def MAJOR = STREAM.split('\\.')[0] - def MINOR = STREAM.split('\\.')[1] +for (ARCH in ARCHS){ + def (MAJOR, MINOR) = STREAM.split('\\.') - pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-macM1-java17'){ + pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-' + ARCHS_JOB_NAME[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).') @@ -24,17 +29,17 @@ pipeline { buildDiscarder(logRotator(numToKeepStr:'5')) } agent { - label 'nc1ht-macos11-arm64' + label '&&AGENT_LABEL&&' } 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 = '/usr/local/openjdk-17/Contents/Home' + JAVA_HOME = '&&JAVA_HOME&&' ANT_HOME = '/opt/homebrew/Cellar/ant/1.10.11/libexec' PATH = "${JAVA_HOME}/bin:${ANT_HOME}/bin:${PATH}" - eclipseArch = 'aarch64' + eclipseArch = '&&ARCH&&' } steps { cleanWs() // workspace not cleaned by default @@ -99,8 +104,9 @@ 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_java17.groovy b/JenkinsJobs/AutomatedTests/I_unit_win32_java17.groovy index 22297a7f378..d990d13fb5b 100644 --- a/JenkinsJobs/AutomatedTests/I_unit_win32_java17.groovy +++ b/JenkinsJobs/AutomatedTests/I_unit_win32_java17.groovy @@ -2,8 +2,7 @@ def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('Jenk def STREAMS = config.Streams for (STREAM in STREAMS){ - def MAJOR = STREAM.split('\\.')[0] - def MINOR = STREAM.split('\\.')[1] + def (MAJOR, MINOR) = STREAM.split('\\.') pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-win32-java17'){ description('Run Eclipse SDK Tests for the platform implied by this job\'s name') diff --git a/JenkinsJobs/Builds/I_build.groovy b/JenkinsJobs/Builds/I_build.groovy index d253cb5f1e1..dcd9ec89072 100644 --- a/JenkinsJobs/Builds/I_build.groovy +++ b/JenkinsJobs/Builds/I_build.groovy @@ -420,8 +420,8 @@ spec: 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-mac-aarch64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false + build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-mac-x86_64-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: 'Start-smoke-tests', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false }