git.delta.rocks / jrsonnet / refs/commits / 341222d06daf

difftreelog

ci switch all benchmarks to realworld tests dir

qvwnzyyzYaroslav Bolyukin2026-05-08parent: #fdfa83e.patch.diff
in: master

3 files changed

modifiednix/benchmarks.nixdiffbeforeafterboth
--- a/nix/benchmarks.nix
+++ b/nix/benchmarks.nix
@@ -2,7 +2,6 @@
   lib,
   runCommand,
   stdenv,
-  fetchFromGitHub,
   fetchJrq,
   go-jsonnet,
   sjsonnet,
@@ -16,16 +15,10 @@
 let
   inherit (cpp-jsonnet) jsonnetBench;
   inherit (go-jsonnet) goJsonnetBench;
-  graalvmBench = fetchFromGitHub {
-    owner = "oracle";
-    repo = "graal";
-    rev = "bc305df3fe587960f7635f0185571500e5988475";
-    hash = "sha256-4EKB1b2o4/qtYQ+nqbbs621OJrtjApsAWEBcw5EjrYc=";
-  };
   realworldVendor = fetchJrq {
     name = "realworld-vendor";
     lockfile = ../tests/realworld/jsonnetfile.lock.json;
-    vendorHash = "sha256-6tXi6bRw77YKB17PhSpJnVYQcsGOvB8sgjKIrFtrwfc=";
+    vendorHash = "sha256-oEUzM6Bhu8ZT8vCtYDbBEjG5BFHYpID+1/2pgXvIAgo=";
   };
   realworldBench = runCommand "realworld-bench" { } ''
     mkdir -p $out
@@ -172,42 +165,63 @@
       ''}
       echo "== Real world" >> $out
       ${mkBench {
-        name = "Graalvm CI";
-        path = "${graalvmBench}/ci.jsonnet";
-        omitSource = true;
-        skipCpp = "takes longer than a hour";
+        name = "GitLab runbooks dashboards";
+        path = "${realworldBench}/entry-gitlab-runbooks.jsonnet";
+        jpaths = [
+          "${realworldBench}/vendor"
+          "${realworldBench}/vendor/runbooks/libsonnet"
+          "${realworldBench}/vendor/runbooks/dashboards"
+          "${realworldBench}/vendor/runbooks/services"
+          "${realworldBench}/vendor/runbooks/metrics-catalog"
+        ];
+        skipCpp = "too slow, takes hours, skews results";
+        skipGo = skipSlow;
+      }}
+      ${mkBench {
+        name = "GraalVM CI";
+        path = "${realworldBench}/entry-graalvm.jsonnet";
+        jpaths = [
+          "${realworldBench}/vendor/graal"
+        ];
+        skipCpp = "too slow, takes hours, skews results";
+        skipGo = skipSlow;
+      }}
+      ${mkBench {
+        name = "Kube-prometheus";
+        path = "${realworldBench}/entry-kube-prometheus.jsonnet";
+        jpaths = [
+          "${realworldBench}/vendor"
+        ];
+        skipCpp = "too slow, takes hours, skews results";
         skipGo = skipSlow;
       }}
       ${mkBench {
         name = "Loki manifests";
         path = "${realworldBench}/entry-loki.jsonnet";
-        jpaths = [ "${realworldBench}/vendor" ];
+        jpaths = [
+          "${realworldBench}/vendor"
+          "${realworldBench}"
+        ];
         skipCpp = "too slow, takes hours, skews results";
         skipGo = skipSlow;
       }}
       ${mkBench {
         name = "Mimir manifests";
         path = "${realworldBench}/entry-mimir.jsonnet";
-        jpaths = [ "${realworldBench}/vendor" ];
+        jpaths = [
+          "${realworldBench}/vendor"
+          "${realworldBench}"
+        ];
         skipCpp = "too slow, takes hours, skews results";
         skipGo = skipSlow;
+        skipScala = "https://github.com/databricks/sjsonnet/issues/829";
       }}
       ${mkBench {
         name = "Tempo manifests";
         path = "${realworldBench}/entry-tempo.jsonnet";
-        jpaths = [ "${realworldBench}/vendor" ];
-        skipCpp = "too slow, takes hours, skews results";
-        skipGo = skipSlow;
-      }}
-      ${mkBench {
-        name = "GitLab runbooks dashboards";
-        path = "${realworldBench}/entry-gitlab-runbooks.jsonnet";
         jpaths = [
           "${realworldBench}/vendor"
-          "${realworldBench}/vendor/runbooks/libsonnet"
-          "${realworldBench}/vendor/runbooks/dashboards"
-          "${realworldBench}/vendor/runbooks/services"
-          "${realworldBench}/vendor/runbooks/metrics-catalog"
+          "${realworldBench}"
         ];
         skipCpp = "too slow, takes hours, skews results";
         skipGo = skipSlow;
modifiednix/fetch-jrq.nixdiffbeforeafterboth
before · nix/fetch-jrq.nix
1{2  lib,3  stdenvNoCC,4  cacert,5  jrsonnet,6}:7{8  lockfile,9  vendorHash,10  name ? "jrq-vendor",11}:12stdenvNoCC.mkDerivation (finalAttrs: {13  inherit name;1415  outputHashMode = "recursive";16  outputHashAlgo = "sha256";17  outputHash = vendorHash;1819  nativeBuildInputs = [20    jrsonnet21    cacert22  ];2324  dontUnpack = true;25  dontConfigure = true;26  dontInstall = true;27  dontFixup = true;2829  SSL_CERT_FILE = "${cacert}/etc/ssl/certs/ca-bundle.crt";30  GIT_SSL_CAINFO = "${cacert}/etc/ssl/certs/ca-bundle.crt";3132  buildPhase = ''33    runHook preBuild3435    export HOME=$TMPDIR3637    install -m644 ${lockfile} jsonnetfile.json38    install -m644 ${lockfile} jsonnetfile.lock.json3940    mkdir -p "$out"41    jrb --jsonnetpkg-home "$out" install4243    runHook postBuild44  '';4546  passthru = {47    inherit lockfile vendorHash;48  };49})
addedtests/realworld/entry-kube-prometheus.jsonnetdiffbeforeafterboth
--- /dev/null
+++ b/tests/realworld/entry-kube-prometheus.jsonnet
@@ -0,0 +1 @@
+import 'kube-prometheus/main.libsonnet'