[GR-46816] Add ubuntu java integration tests

PullRequest: graal/15044
middas-0706 · Jul 23, 2023 · 95ac311 · 95ac311
2 parents b483348 + 090a382
commit 95ac311
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 5 deletions.
diff --git a/ci/ci_common/common.jsonnet b/ci/ci_common/common.jsonnet
@@ -80,8 +80,10 @@ common + common.frequencies + {
     },
   },
 
-  linux_amd64: linux_deps_extras + common.linux_amd64 + graal_common_extras,
-  linux_aarch64: linux_deps_extras + common.linux_aarch64 + graal_common_extras,
+  linux_amd64_common: {os:: "linux"}  + graal_common_extras,
+  linux_amd64: {os_distro:: "ol"} + common.linux_amd64 + self.linux_amd64_common + linux_deps_extras,
+  linux_amd64_ubuntu: {os_distro:: "ubuntu"} + common.linux_amd64_ubuntu + self.linux_amd64_common,
+  linux_aarch64: {os_distro:: "ol"} + linux_deps_extras + common.linux_aarch64 + graal_common_extras,
   darwin_amd64: common.darwin_amd64 + graal_common_extras,
   darwin_aarch64: common.darwin_aarch64 + graal_common_extras,
   windows_amd64: common.windows_amd64 + graal_common_extras,

diff --git a/ci/common.jsonnet b/ci/common.jsonnet
@@ -141,10 +141,10 @@ local common_json = import "../common.json";
         "*.log",
       ],
 
-      packages+: if self.os == "linux" && self.arch == "amd64" then {
+      packages+: if self.os == "linux" && self.arch == "amd64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
         "00:devtoolset": "==7",
         "01:binutils": ">=2.34",
-      } else if self.os == "linux" && self.arch == "aarch64" then {
+      } else if self.os == "linux" && self.arch == "aarch64" && std.objectHas(self, "os_distro") && self.os_distro == "ol" then {
         "00:devtoolset": "==7",
       } else {},
     },
@@ -239,6 +239,12 @@ local common_json = import "../common.json";
       mount_modules: true,
     },
   },
+  local ubuntu22 = {
+      docker: {
+        image: "buildslave_ubuntu22",
+        mount_modules: true,
+      },
+  },
   local deps_linux = {
   },
   local deps_darwin = {
@@ -255,6 +261,7 @@ local common_json = import "../common.json";
   local aarch64 = { arch:: "aarch64", capabilities+: [self.arch] },
 
   linux_amd64: linux + amd64 + ol7,
+  linux_amd64_ubuntu: linux + amd64 + ubuntu22,
   linux_aarch64: linux + aarch64,
 
   darwin_amd64: darwin + amd64,

diff --git a/vm/ci/ci_common/common.jsonnet b/vm/ci/ci_common/common.jsonnet
@@ -162,10 +162,14 @@ local devkits = graal_common.devkits;
 
   graalpython_darwin_aarch64: self.sulong_darwin_aarch64 + {},
 
-  vm_linux_amd64: self.common_vm_linux + graal_common.linux_amd64 + graal_common.deps.svm {
+  vm_linux_amd64_common: graal_common.deps.svm {
     capabilities+: ['manycores', 'ram16gb', 'fast'],
   },
 
+  vm_linux_amd64: graal_common.linux_amd64 + self.common_vm_linux + self.vm_linux_amd64_common,
+
+  vm_linux_amd64_ubuntu: graal_common.linux_amd64_ubuntu + self.common_vm + self.vm_linux_amd64_common,
+
   vm_linux_aarch64: self.common_vm_linux + graal_common.linux_aarch64,
 
   vm_darwin_amd64: self.common_vm_darwin + graal_common.darwin_amd64 + {
@@ -194,6 +198,10 @@ local devkits = graal_common.devkits;
     targets+: ['gate']
   },
 
+  gate_vm_linux_amd64_ubuntu: self.vm_linux_amd64_ubuntu + {
+    targets+: ['gate']
+  },
+
   gate_vm_linux_aarch64: self.vm_linux_aarch64 + {
     targets+: ['gate'],
   },
@@ -210,6 +218,10 @@ local devkits = graal_common.devkits;
     targets+: ['gate'],
   },
 
+  daily_vm_linux_amd64_ubuntu: self.vm_linux_amd64_ubuntu + {
+    targets+: ['daily']
+  },
+
   bench_daily_vm_linux_amd64: self.vm_linux_amd64 + {
     capabilities+: ['no_frequency_scaling'],
     targets+: ['daily', 'bench'],