ci: move galahad filtering to overlays

zapster · zapster · commit 8e2ca35f8754 · 2024-02-15T12:04:14.000+01:00
diff --git a/ci-branch-config.jsonnet b/ci-branch-config.jsonnet
@@ -1,14 +1,14 @@
 {
   "galahad.*": {
-    "config_file": "galahad.jsonnet",
+    "config_file": "ci.jsonnet",
     "overlay_file": "galahad-graal.jsonnet",
   },
   "release/galahad/.*": {
-    "config_file": "galahad.jsonnet",
+    "config_file": "ci.jsonnet",
     "overlay_file": "galahad-graal.jsonnet",
   },
   "cpu/galahad/.*": {
-    "config_file": "galahad.jsonnet",
+    "config_file": "ci.jsonnet",
     "overlay_file": "galahad-graal.jsonnet",
   },
 }
diff --git a/ci.jsonnet b/ci.jsonnet
@@ -63,6 +63,4 @@ local verify_ci = (import 'ci/ci_common/ci-check.libsonnet').verify_ci;
   assert verify_ci(self.builds),
   // verify that the run-spec demo works
   assert (import "ci/ci_common/run-spec-demo.jsonnet").check(),
-  // ensure that the galahad CI configuration does not break
-  assert std.type(std.manifestJson((import "galahad.jsonnet").builds)) == "string"
 }
diff --git a/galahad.jsonnet b/galahad.jsonnet

Original file line number	Diff line number	Diff line change
`@@ -63,6 +63,4 @@ local verify_ci = (import 'ci/ci_common/ci-check.libsonnet').verify_ci;`
`63`	`63`	`assert verify_ci(self.builds),`
`64`	`64`	`// verify that the run-spec demo works`
`65`	`65`	`assert (import "ci/ci_common/run-spec-demo.jsonnet").check(),`
`66`		`- // ensure that the galahad CI configuration does not break`
`67`		`- assert std.type(std.manifestJson((import "galahad.jsonnet").builds)) == "string"`
`68`	`66`	`}`