Run jobs using emsdk on OL8

Author: jirkamarsik

ci/common.jsonnet

@@ -323,6 +323,24 @@ local common_json = import "../common.json";
       },
     },
 
+    wasm_ol8:: {
+      downloads+: {
+        WABT_DIR: {name: 'wabt', version: '1.0.36-ol8', platformspecific: true},
+      },
+      environment+: {
+        WABT_DIR: '$WABT_DIR/bin',
+      },
+    },
+
+    emsdk_ol8:: {
+      downloads+: {
+        EMSDK_DIR: {name: 'emsdk', version: '4.0.10', platformspecific: true},
+      },
+      environment+: {
+        EMCC_DIR: '$EMSDK_DIR/upstream/emscripten/'
+      }
+    },
+
     fastr:: {
       # Note: On both Linux and MacOS, FastR depends on the gnur module and on gfortran
       # of a specific version (4.8.5 on Linux, 10.2.0 on MacOS)

wasm/ci/ci.jsonnet

@@ -28,13 +28,13 @@ jdks + wasm_common +
     $.jdkLatest + platform          + $.tier3        + $.gate_graalwasm_full        + {environment+: {GATE_TAGS: 'build,wasmtest'}}                + {name: 'gate-graalwasm-unittest' + self.name_suffix}
     for platform in [$.linux_aarch64, $.windows_amd64, $.darwin_aarch64]
   ] + [
-    $.jdkLatest + $.linux_amd64     + $.tier2        + $.gate_graalwasm_emsdk_full  + {environment+: {GATE_TAGS: 'buildall,wasmextratest'}}        + {name: 'gate-graalwasm-extra-unittest' + self.name_suffix},
-    $.jdkLatest + $.linux_amd64     + $.tier2        + $.gate_graalwasm_emsdk_full  + {environment+: {GATE_TAGS: 'buildall,wasmbenchtest'}}        + {name: 'gate-graalwasm-benchtest' + self.name_suffix},
+    $.jdkLatest + $.linux_amd64_ol8 + $.tier2        + $.gate_graalwasm_emsdk_full  + {environment+: {GATE_TAGS: 'buildall,wasmextratest'}}        + {name: 'gate-graalwasm-extra-unittest' + self.name_suffix},
+    $.jdkLatest + $.linux_amd64_ol8 + $.tier2        + $.gate_graalwasm_emsdk_full  + {environment+: {GATE_TAGS: 'buildall,wasmbenchtest'}}        + {name: 'gate-graalwasm-benchtest' + self.name_suffix},
 
-    $.jdkLatest + $.linux_amd64     + $.weekly       + $.gate_graalwasm_coverage    + tools_java_home                                              + {name: 'weekly-graalwasm-coverage' + self.name_suffix},
+    $.jdkLatest + $.linux_amd64_ol8 + $.weekly       + $.gate_graalwasm_coverage    + tools_java_home                                              + {name: 'weekly-graalwasm-coverage' + self.name_suffix},
 
     # Benchmark jobs.
-    $.jdkLatest + $.linux_amd64     + $.bench_daily  + $.bench_graalwasm_emsdk_full + {
+    $.jdkLatest + $.linux_amd64_ol8 + $.bench_daily  + $.bench_graalwasm_emsdk_full + {
       name: 'bench-graalwasm-c-micro' + self.name_suffix,
       environment+: {
         BENCH_RUNNER: 'run-c-micro-benchmarks',
@@ -43,7 +43,7 @@ jdks + wasm_common +
       },
     },
 
-    $.jdkLatest + $.linux_amd64     + $.bench_daily  + $.bench_graalwasm_emsdk_full + {
+    $.jdkLatest + $.linux_amd64_ol8 + $.bench_daily  + $.bench_graalwasm_emsdk_full + {
       name: 'bench-graalwasm-wat-micro' + self.name_suffix,
       environment+: {
         BENCH_RUNNER: 'run-wat-micro-benchmarks',

wasm/ci/ci_common/common.jsonnet

@@ -67,6 +67,7 @@ local graal_suite_root = root_ci.graal_suite_root;
   },
 
   linux_amd64:: common.linux_amd64 + self.linux_common,
+  linux_amd64_ol8:: common.linux_amd64_ol8 + self.linux_common,
   linux_aarch64:: common.linux_aarch64 + self.linux_common,
 
   darwin_aarch64:: common.darwin_aarch64,
@@ -78,15 +79,6 @@ local graal_suite_root = root_ci.graal_suite_root;
 
   windows_amd64:: common.windows_amd64 + self.windows_common,
 
-  emsdk:: {
-    downloads+: {
-      EMSDK_DIR: {name: 'emsdk', version: '4.0.10', platformspecific: true},
-    },
-    environment+: {
-      EMCC_DIR: '$EMSDK_DIR/upstream/emscripten/'
-    }
-  },
-
   ocaml_dune:: {
     downloads+: {
       OCAML_DIR: {name: 'ocaml-dune', version: '3.16.1', platformspecific: true},
@@ -193,7 +185,7 @@ local graal_suite_root = root_ci.graal_suite_root;
   },
 
   eclipse_jdt              :: common.deps.pylint + common.deps.eclipse + common.deps.jdt,
-  wabt_emsdk               :: common.deps.wasm + self.emsdk,
-  wabt_emsdk_ocamlbuild    :: common.deps.wasm + self.emsdk + self.ocaml_dune,
+  wabt_emsdk               :: common.deps.wasm_ol8 + common.deps.emsdk_ol8,
+  wabt_emsdk_ocamlbuild    :: common.deps.wasm_ol8 + common.deps.emsdk_ol8 + self.ocaml_dune,
 
 }