Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add special.system for JDK21+ mac64 and reset variables inside the parallel job #1160

Merged
merged 1 commit into from
Dec 11, 2024
Merged

Add special.system for JDK21+ mac64 and reset variables inside the parallel job #1160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions pipelines/build/common/openjdk_build_pipeline.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,10 +389,6 @@ class Build {
def jdkBranch = getJDKBranch()
def jdkRepo = getJDKRepo()
def openj9Branch = (buildConfig.SCM_REF && buildConfig.VARIANT == 'openj9') ? buildConfig.SCM_REF : 'master'

def vendorTestRepos = ''
def vendorTestBranches = ''
def vendorTestDirs = ''
List testList = buildConfig.TEST_LIST
def enableTestDynamicParallel = Boolean.valueOf(buildConfig.ENABLE_TESTDYNAMICPARALLEL)
def aqaBranch = 'master'
Expand All @@ -411,7 +407,6 @@ class Build {
testTime = '120'
parallel = 'Dynamic'
}
def testLabel = ''

testList.each { testType ->
// For each requested test, i.e 'sanity.openjdk', 'sanity.system', 'sanity.perf', 'sanity.external', call test job
Expand Down Expand Up @@ -446,10 +441,14 @@ class Build {
}
}

def testLabel = ''
// Eclipse Adoptium Temurin reproducible comparing on x64 mac required to run on aarch64 mac
if (testType == 'special.system' && jobName.contains('x86-64_mac') && buildConfig.VARIANT == 'temurin') {
testLabel = 'ci.role.test&&hw.arch.aarch64&&(sw.os.osx||sw.os.mac)'
}
def vendorTestRepos = ''
def vendorTestBranches = ''
def vendorTestDirs = ''
if (testType == 'special.system' || testType == 'dev.system') {
def useAdoptShellScripts = Boolean.valueOf(buildConfig.USE_ADOPT_SHELL_SCRIPTS)
vendorTestBranches = useAdoptShellScripts ? ADOPT_DEFAULTS_JSON['repository']['build_branch'] : DEFAULTS_JSON['repository']['build_branch']
Expand Down Expand Up @@ -2478,6 +2477,7 @@ def buildScriptsAssemble(
} catch (Exception e) {
currentBuild.result = 'FAILURE'
context.println "Execution error: ${e}"

def sw = new StringWriter()
def pw = new PrintWriter(sw)
e.printStackTrace(pw)
Expand Down
4 changes: 3 additions & 1 deletion pipelines/jobs/configurations/jdk21u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,9 @@ class Config21 {
additionalTestLabels: [
openj9 : '!sw.os.osx.10_11'
],
test : 'default',
test: [
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system']
],
configureArgs : '--enable-dtrace',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
Expand Down
4 changes: 3 additions & 1 deletion pipelines/jobs/configurations/jdk23u_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ class Config23 {
openj9 : '!sw.os.osx.10_11',
temurin : '!sw.os.osx.10_14'
],
test : 'default',
test: [
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system']
],
configureArgs : '--enable-dtrace',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
Expand Down
4 changes: 3 additions & 1 deletion pipelines/jobs/configurations/jdk24_pipeline_config.groovy
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@ class Config24 {
openj9 : '!sw.os.osx.10_11',
temurin : '!sw.os.osx.10_14'
],
test : 'default',
test: [
weekly : ['sanity.openjdk', 'sanity.system', 'extended.system', 'sanity.perf', 'sanity.functional', 'extended.functional', 'extended.openjdk', 'extended.perf', 'special.functional', 'special.openjdk', 'dev.functional', 'dev.system', 'special.system']
],
configureArgs : '--enable-dtrace',
buildArgs : [
'temurin' : '--create-jre-image --create-sbom'
Expand Down
Loading