Skip to content

Commit eea7d48

Browse files
committed
replace os specific labels for mac aarch,x64 with sw.tool.xcode.15_2
Related changes to build base on XCode level rather os specified version. related: runtimes/infrastructure#8105. Also unnecessary additionalTestLables related to mac_10_11 removes as those nodes are not exists anymore and the fact that test framework set labels in logic. e.g here Sigend-off-by: [email protected]
1 parent 9dce4dc commit eea7d48

File tree

1 file changed

+2
-6
lines changed

1 file changed

+2
-6
lines changed

buildenv/jenkins/variables/defaults.yml

+2-6
Original file line numberDiff line numberDiff line change
@@ -398,13 +398,9 @@ x86-64_mac:
398398
8: '--with-toolchain-type=clang'
399399
openjdk_reference_repo: '/Users/jenkins/openjdk_cache'
400400
node_labels:
401-
build: 'ci.role.build && hw.arch.x86 && sw.os.mac.10_15'
401+
build: 'ci.role.build && hw.arch.x86 && sw.os.mac && sw.tool.xcode.15_2'
402402
build_env:
403403
vars: 'OPENJ9_JAVA_OPTIONS=-Xdump:system+java:events=systhrow,filter=java/lang/ClassCastException,request=exclusive+prepwalk+preempt'
404-
extra_test_labels:
405-
23: '!sw.os.mac.10_15'
406-
24: '!sw.os.mac.10_15'
407-
next: '!sw.os.mac.10_15'
408404
fail_pattern: 'IOException caught during compilation: Resource deadlock avoided'
409405
#========================================#
410406
# Mac Aarch64
@@ -424,7 +420,7 @@ aarch64_mac:
424420
all: '--with-noncompressedrefs'
425421
openjdk_reference_repo: '/Users/jenkins/openjdk_cache'
426422
node_labels:
427-
build: 'ci.role.build && hw.arch.aarch64 && sw.os.mac'
423+
build: 'ci.role.build && hw.arch.aarch64 && sw.os.mac && sw.tool.xcode.15_2'
428424
fail_pattern: 'IOException caught during compilation: Resource deadlock avoided'
429425
#========================================#
430426
# Linux PPCLE 64bits /w OpenJDK JSR292

0 commit comments

Comments
 (0)