diff --git a/ci/common.jsonnet b/ci/common.jsonnet index 43f9f366a247..d804edc5c254 100644 --- a/ci/common.jsonnet +++ b/ci/common.jsonnet @@ -68,7 +68,9 @@ local common_json = import "../common.json"; local _oraclejdk = common_json.jdks["oraclejdk-latest"]; local _ov = "ee-%s+%s" % [_oraclejdk.version, _oraclejdk.build_id]; local _lv = _labsjdk.version; - assert std.startsWith(_lv, _ov) : "update oraclejdk-latest to match labsjdk-ee-latest: %s+%s vs %s" % [_oraclejdk.version, _oraclejdk.build_id, _labsjdk.version]; + # Skip the check if we are not using a labsjdk. This can happen on JDK integration branches. + local no_labsjdk = _labsjdk.name != "labsjdk"; + assert no_labsjdk || std.startsWith(_lv, _ov) : "update oraclejdk-latest to match labsjdk-ee-latest: %s+%s vs %s" % [_oraclejdk.version, _oraclejdk.build_id, _labsjdk.version]; true, # The raw jdk data, the same as common_json.jdks + { jdk_version:: }