Skip to content

Commit c7165d5

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

File tree

1 file changed

+14
-5
lines changed

1 file changed

+14
-5
lines changed

JenkinsJobs/AutomatedTests/I_unit_win32.groovy

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,20 @@
11
def config = new groovy.json.JsonSlurper().parseText(readFileFromWorkspace('JenkinsJobs/JobDSL.json'))
22
def STREAMS = config.Streams
33

4+
def ARCHS = ['aarch64', 'x86_64']
5+
def ARCHS_JOB_NAME = ['aarch64': '', 'x86_64': 'aarch64'] // preserve old job labels for now, to affect all downstream scripts
6+
def ARCHS_JAVA_VERSION = ['aarch64': '21', 'x86_64': '17']
7+
def ARCHS_AGENT_LABEL = ['aarch64': 'rie8t-win11-arm64', 'x86_64': 'qa6xd-win11']
8+
def ARCHS_JAVA_HOME = ['aarch64': '', 'x86_64': 'C:\\\\Program Files\\\\Eclipse Adoptium\\\\jdk-17.0.11+9']
9+
10+
//TODO: adjust java version!
11+
412
for (STREAM in STREAMS){
13+
for (ARCH in ARCHS){
514
def MAJOR = STREAM.split('\\.')[0]
615
def MINOR = STREAM.split('\\.')[1]
716

8-
pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-win32-x86_64-java17'){
17+
pipelineJob('AutomatedTests/ep' + MAJOR + MINOR + 'I-unit-win32-' + ARCH + '-java' + ARCHS_JAVA_VERSION[ARCH]){
918
description('Run Eclipse SDK Tests for the platform implied by this job\'s name')
1019
parameters { // Define parameters in job configuration to make them available from the very first build onwards
1120
stringParam('buildId', null, 'Build Id to test (such as I20240611-1800, N20120716-0800).')
@@ -24,15 +33,14 @@ pipeline {
2433
buildDiscarder(logRotator(numToKeepStr:'5'))
2534
}
2635
agent {
27-
label 'qa6xd-win11'
36+
label \'''' + ARCHS_AGENT_LABEL[ARCH] + '''\'
2837
}
2938
3039
stages {
3140
stage('Run tests'){
3241
environment {
3342
// 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}"
43+
JAVA_HOME = \'''' + ARCHS_JAVA_HOME[ARCH] + '''\'
3644
}
3745
steps {
3846
cleanWs() // workspace not cleaned by default
@@ -61,7 +69,7 @@ set JAVA_HOME
6169
6270
ant -f getEBuilder.xml -Djava.io.tmpdir=%WORKSPACE%/tmp -DbuildId=%buildId% -DeclipseStream=%STREAM% -DEBUILDER_HASH=%EBUILDER_HASH% ^
6371
-DdownloadURL="https://download.eclipse.org/eclipse/downloads/drops4/%buildId%" ^
64-
-Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=x86_64 ^
72+
-Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=''' + ARCH + ''' ^
6573
-DtestSuite=all ^
6674
-Djvm="%JAVA_HOME%\\\\bin\\\\java.exe"
6775
@@ -82,3 +90,4 @@ ant -f getEBuilder.xml -Djava.io.tmpdir=%WORKSPACE%/tmp -DbuildId=%buildId% -De
8290
}
8391
}
8492
}
93+
}

0 commit comments

Comments
 (0)