X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_fedora.ml;h=c101613c1b8cbfd4bc18bdad5d468873b3343383;hb=d561a25015bb195b483cb22b1167074c17611997;hp=34ad75e785c4276e8d7d8e048be928c6155c4afe;hpb=f94bcc0a21f92ca5f33623cdfa4800d1950266e2;p=goaljobs-goals.git

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index 34ad75e..c101613 100644
--- a/libguestfs_fedora.ml
+++ b/libguestfs_fedora.ml
@@ -22,10 +22,10 @@ let package = "libguestfs"
 
 (* How branches in libguestfs upstream map to branches in Fedora. *)
 let branches = [
-  "1.20-stable", "f18";            (* F18 follows 1.20. *)
-  "1.22-stable", "f19";            (* F19 follows 1.22. *)
-(*  "1.24-stable", "f20"; *)       (* F20 is being built by hand ATM. *)
-  "1.25-development", "master";    (* Rawhide follows development. *)
+  "1.29-development", "master";    (* Rawhide follows development. *)
+  "1.29-development", "f22";       (* F22 follows development (for now). *)
+  "1.28-stable", "f21";            (* F21 follows 1.28. *)
+  "1.26-stable", "f20";            (* F20 follows 1.26. *)
 ]
 
 (* Goal: Latest website version has been built in every branch. *)
@@ -43,7 +43,9 @@ and fedora_built version branch =
   let specfile = fedora_specfile package branch in
 
   target (file_contains_string specfile version.version &&
-            koji_build_state (fedora_verrel package branch) == `Complete);
+            match koji_build_state (fedora_verrel package branch) with
+            | `Complete | `Building -> true
+            | _ -> false);
 
   require (sources_uploaded version branch);
   require (specfile_pushed version branch);