Skip to content

Commit 372c67d

Browse files
committed
[I-Build] Add nightly tests for win32.win32.aarch64
Part of #577
1 parent de3030c commit 372c67d

File tree

4 files changed

+15
-4
lines changed

4 files changed

+15
-4
lines changed

JenkinsJobs/AutomatedTests/I_unit_win32.groovy

+12-4
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 (BUILD_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-' + BUILD_CONFIG.arch + '-java' + BUILD_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).')
@@ -22,17 +28,18 @@ pipeline {
2228
buildDiscarder(logRotator(numToKeepStr:'5'))
2329
}
2430
agent {
25-
label 'qa6xd-win11'
31+
label \'''' + BUILD_CONFIG.agentLabel + '''\'
2632
}
2733
2834
stages {
2935
stage('Run tests'){
3036
environment {
3137
// 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
32-
JAVA_HOME = 'C:\\\\Program Files\\\\Eclipse Adoptium\\\\jdk-17.0.11+9'
38+
JAVA_HOME = \'''' + BUILD_CONFIG.javaHome + '''\'
3339
ANT_HOME = tool(type:'ant', name:'apache-ant-latest')
3440
PATH = "${JAVA_HOME}\\\\bin;${ANT_HOME}\\\\bin;${PATH}"
3541
ANT_OPTS = "-Djava.io.tmpdir=${WORKSPACE}\\\\tmp -Djava.security.manager=allow"
42+
eclipseArch = \'''' + BUILD_CONFIG.arch + ''''
3643
}
3744
steps {
3845
cleanWs() // workspace not cleaned by default
@@ -65,7 +72,7 @@ java -XshowSettings -version 1>javaSettings.txt 2>&1
6572
6673
ant -f getEBuilder.xml -DbuildId=%buildId% -DeclipseStream=%STREAM% -DEBUILDER_HASH=%EBUILDER_HASH% ^
6774
-DdownloadURL="https://download.eclipse.org/eclipse/downloads/drops4/%buildId%" ^
68-
-Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=x86_64 ^
75+
-Dargs=all -Dosgi.os=win32 -Dosgi.ws=win32 -Dosgi.arch=%eclipseArch% ^
6976
-DtestSuite=all
7077
@REM For smaller test-suites see: https://github.com/eclipse-platform/eclipse.platform.releng.aggregator/blob/be721e33c916b03c342e7b6f334220c6124946f8/production/testScripts/configuration/sdk.tests/testScripts/test.xml#L1893-L1903
7178
\'\'\'
@@ -85,3 +92,4 @@ ant -f getEBuilder.xml -DbuildId=%buildId% -DeclipseStream=%STREAM% -DEBUILDER_
8592
}
8693
}
8794
}
95+
}

JenkinsJobs/Builds/I_build.groovy

+1
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,7 @@ spec:
422422
build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-linux-x86_64-java23', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
423423
build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-macosx-aarch64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
424424
build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-macosx-x86_64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
425+
build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-win32-aarch64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
425426
build job: 'AutomatedTests/ep''' + MAJOR + MINOR + '''I-unit-win32-x86_64-java17', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
426427
build job: 'Start-smoke-tests', parameters: [string(name: 'buildId', value: "${env.BUILD_IID.trim()}")], wait: false
427428
}

cje-production/scripts/publish.xml

+1
Original file line numberDiff line numberDiff line change
@@ -186,6 +186,7 @@
186186
<string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-macosx-x86_64-java17_macosx.cocoa.x86_64_17</string>
187187
<string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-macosx-aarch64-java17_macosx.cocoa.aarch64_17</string>
188188
<string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-x86_64-java17_win32.win32.x86_64_17</string>
189+
<string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-win32-aarch64-java17_win32.win32.aarch64_17</string>
189190
<string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-linux-x86_64-java17_linux.gtk.x86_64_17</string>
190191
<string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-linux-x86_64-java21_linux.gtk.x86_64_21</string>
191192
<string>ep${eclipseStreamMajor}${eclipseStreamMinor}${buildType}-unit-linux-x86_64-java23_linux.gtk.x86_64_23</string>

eclipse.platform.releng.tychoeclipsebuilder/eclipse/publishingFiles/staticDropFiles/testConfigs.php

+1
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-macosx-x86_64-java17_macosx.cocoa.x86_64_17";
1414
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-macosx-aarch64-java17_macosx.cocoa.aarch64_17";
1515
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32-x86_64-java17_win32.win32.x86_64_17";
16+
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-win32-aarch64-java17_win32.win32.aarch64_17";
1617
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-linux-x86_64-java17_linux.gtk.x86_64_17";
1718
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-linux-x86_64-java21_linux.gtk.x86_64_21";
1819
$expectedTestConfigs[]="ep$STREAMMajor$STREAMMinor$TESTED_BUILD_TYPE-unit-linux-x86_64-java23_linux.gtk.x86_64_23";

0 commit comments

Comments
 (0)