libguestfs: Skip some tests.

[goaljobs-goals.git] / fedora_ocaml_rebuild.ml

diff --git a/fedora_ocaml_rebuild.ml b/fedora_ocaml_rebuild.ml
index 54a2551..19b306c 100644 (file)
--- a/fedora_ocaml_rebuild.ml
+++ b/fedora_ocaml_rebuild.ml
@@ -9,17 +9,18 @@ open Git
 open Fedora
 
 let branch = "master"
-let side_tag = Some "f27-ocaml"
+let side_tag = Some "f27-ocaml2"
+(*let side_tag = None*)
 
 let koji_target =
   match side_tag with
   | Some t -> t
-  | None -> "rawhide"
+  | None -> "f27-build" (* see: https://pagure.io/koji/issue/485 *)
 
 (* The name of the rebuild, and also the magic substring that must
  * appear in the %changelog when the package has been rebuilt.
  *)
-let rebuild_name = "OCaml 4.04.1"
+let rebuild_name = "OCaml 4.05.0"
 
 (* Local repository that contains build dependencies. *)
 let yum_repo = "koji-rawhide"
@@ -28,7 +29,10 @@ let yum_repo = "koji-rawhide"
  * dependent packages.
  *)
 let blocked = [
-  "brltty";                        (* broken for non-OCaml reasons *)
+    "coq"; (* https://github.com/ocaml/ocaml/pull/1268 *)
+    "ocaml-gsl"; (* unknown linking error, only happens in Koji, may
+                    be related to binutils used to build gsl? *)
+    "ocaml-lacaml"; (* same as gsl *)
 ]
 let blocked pkg = List.mem pkg blocked
 
@@ -41,7 +45,12 @@ let ignored pkg = List.mem pkg ignored
 
 (* List of OCaml-related source package names. *)
 let source_packages =
-  let dirs = shlines "cd %s && ls -1d ocaml*" fedora_dir in
+  let dirs = shlines "
+       cd %s && \
+       for f in ocaml*; do
+         [ -f \"$f/master/$f.spec\" ] && echo \"$f\"
+       done
+  " fedora_dir in
   dirs @ [ "alt-ergo"; "apron"; "brltty"; "coccinelle"; "coq";
            "cduce"; "frama-c"; "gappalib-coq"; "graphviz"; "hevea"; "hivex";
            "plplot"; "virt-top"; "why3"; "z3";