Skip to content

Commit 86519fe

Browse files
Always generate jdk8u aarch32 job, but dont add to pipeline config (#705)
Signed-off-by: Andrew Leonard <[email protected]>
1 parent ed05e6a commit 86519fe

File tree

2 files changed

+10
-1
lines changed

2 files changed

+10
-1
lines changed

pipelines/build/regeneration/release_pipeline_generator.groovy

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,12 @@ node('worker') {
9393
throw new Exception("[ERROR] enable to load jdk${javaVersion}u_release.groovy nor jdk${javaVersion}_release.groovy does not exist!")
9494
}
9595

96+
// For jdk8u remove aarch32 from the pipeline's target so it does not get built automatically,
97+
// jdk8u aarch32 is dependent on upstream release in the separate port repository, and will get started manually.
98+
if (javaVersion == 8 && target.targetConfigurations.containsKey('arm32Linux')) {
99+
target.targetConfigurations.remove('arm32Linux')
100+
}
101+
96102
config.put('targetConfigurations', target.targetConfigurations)
97103

98104
config.put('defaultsJson', DEFAULTS_JSON)
@@ -146,4 +152,4 @@ node('worker') {
146152
println '[INFO] Cleaning up...'
147153
cleanWs deleteDirs: true
148154
}
149-
}
155+
}

pipelines/jobs/configurations/jdk8u_release.groovy

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ targetConfigurations = [
2323
'aarch64Linux' : [
2424
'temurin'
2525
],
26+
'arm32Linux' : [
27+
'temurin'
28+
],
2629
'x64Solaris': [
2730
'temurin'
2831
],

0 commit comments

Comments
 (0)