fix CI assertions

Author: ntemmar

common.jsonnet

@@ -32,7 +32,7 @@ local add_jdk_version(name) =
   local version = find_first_integer(jdk.version);
   // santity check that the parsed version is also included in the name
   assert std.length(std.findSubstr(std.toString(version), name)) == 1 : "Cannot find version %d in name %s" % [version, name];
-  { jdk_version:: version}
+  { jdk_version:: version }
 ;
 
 {

vm/ci_common/common.jsonnet

@@ -6,12 +6,12 @@ local common_json = composable(import '../../common.json');
 local devkits = common_json.devkits;
 
 {
-  verify_name(build): build + {
+  verify_name(build): {
     expected_prefix:: std.join('-', [target for target in build.targets if target != "mach5"]) + '-vm',
     expected_suffix:: build.os + '-' + build.arch,
     assert std.startsWith(build.name, self.expected_prefix) : "'%s' is defined in '%s' with '%s' targets but does not start with '%s'" % [build.name, build.defined_in, build.targets, self.expected_prefix],
     assert std.endsWith(build.name, self.expected_suffix) : "'%s' is defined in '%s' with os/arch '%s/%s' but does not end with '%s'" % [build.name, build.defined_in, build.os, build.arch, self.expected_suffix],
-  },
+  } + build,
 
   vm_env_mixin(shortverison): {
     local jdk = self.downloads.JAVA_HOME,