Skip to content

Commit 2a89368

Browse files
committed
[I-Build] Add nightly tests for win32.win32.aarch64
Part of #577
1 parent 6c8faac commit 2a89368

File tree

1 file changed

+12
-5
lines changed

1 file changed

+12
-5
lines changed

JenkinsJobs/AutomatedTests/I_unit_win32.groovy

+12-5
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,17 @@
11
def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JenkinsJobs/JobDSL.json'))
22
def STREAMS = config.Streams
33

4+
def BUILD_CONFIGURATIONS = [
5+
[arch: 'aarch64', javaVersion: '21', agentLabel: 'rie8t-win11-arm64', javaHome: 'C:\\\\Program Files (Arm)\\\\Microsoft\\\\jdk-21.0.2.13-hotspot' ]
6+
[arch: 'x86_64', javaVersion: '17', agentLabel: 'qa6xd-win11', javaHome: 'C:\\\\Program Files\\\\Eclipse Adoptium\\\\jdk-17.0.11+9' ]
7+
]
8+
49
for (STREAM in STREAMS){
10+
for (B_CONFIG in BUILD_CONFIGURATIONS){
511
def MAJOR = STREAM.split('\\.')[0]
612
def MINOR = STREAM.split('\\.')[1]
713

8-
pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-win32-x86_64-java17'){
14+
pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-win32-' + B_CONFIG.arch + '-java' + B_CONFIG.javaVersion){
915
description('Run Eclipse SDK Tests for the platform implied by this job\'s name')
1016
parameters { // Define parameters in job configuration to make them available from the very first build onwards
1117
stringParam('buildId', null, 'Build Id to test (such as I20240611-1800, N20120716-0800).')
@@ -24,15 +30,15 @@ pipeline {
2430
buildDiscarder(logRotator(numToKeepStr:'5'))
2531
}
2632
agent {
27-
label 'qa6xd-win11'
33+
label \'''' + B_CONFIG.agentLabel + '''\'
2834
}
2935
3036
stages {
3137
stage('Run tests'){
3238
environment {
3339
// 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
34-
JAVA_HOME = 'C:\\\\PROGRA~1\\\\ECLIPS~1\\\\jdk-17.0.11+9\\\\'
35-
PATH = "%JAVA_HOME%\\\\bin;C:\\\\ProgramData\\\\Boxstarter;C:\\\\Program Files\\\\IcedTeaWeb\\\\WebStart\\\\bin;C:\\\\Users\\\\jenkins_vnc\\\\AppData\\\\Local\\\\Microsoft\\\\WindowsApps;${env.PATH}"
40+
JAVA_HOME = \'''' + B_CONFIG.javaHome + '''\'
41+
eclipseArch = \'''' + B_CONFIG.arch + ''''
3642
}
3743
steps {
3844
cleanWs() // workspace not cleaned by default
@@ -61,7 +67,7 @@ set JAVA_HOME
6167
6268
ant -f getEBuilder.xml -Djava.io.tmpdir=%WORKSPACE%/tmp -DbuildId=%buildId% -DeclipseStream=%STREAM% -DEBUILDER_HASH=%EBUILDER_HASH% ^
6369
-DdownloadURL="https://download.eclipse.org/eclipse/downloads/drops4/%buildId%" ^
64-
-Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=x86_64 ^
70+
-Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=%eclipseArch% ^
6571
-DtestSuite=all ^
6672
-Djvm="%JAVA_HOME%\\\\bin\\\\java.exe"
6773
@@ -82,3 +88,4 @@ ant -f getEBuilder.xml -Djava.io.tmpdir=%WORKSPACE%/tmp -DbuildId=%buildId% -De
8288
}
8389
}
8490
}
91+
}

0 commit comments

Comments
 (0)