X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_fedora.ml;h=56057ec39415c50503ffc4f694b00bd58d3f2c0e;hb=19bafbc8d9d829cd95a26efb5bf5c208bfdf6036;hp=dfc67700aafb53de488220dcae9e3b64d5b09fc3;hpb=bc69fe39242ab6ff5f345f8c1942ab3b9cbc5167;p=goaljobs-goals.git

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index dfc6770..56057ec 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 built by hand. *)
-(*  "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);
@@ -92,7 +94,8 @@ and specfile_updated version branch =
 
 and specfile_committed version branch =
   let repodir = fedora_repo package branch in
-  let key = sprintf "libguestfs_fedora_specfile_committed_%s" version.version in
+  let key = sprintf "libguestfs_fedora_specfile_committed_%s_%s"
+    branch version.version in
 
   target (memory_exists key);
   onrun (fun () -> memory_set key "1");
@@ -106,7 +109,8 @@ and specfile_committed version branch =
 
 and specfile_pushed version branch =
   let repodir = fedora_repo package branch in
-  let key = sprintf "libguestfs_fedora_specfile_pushed_%s" version.version in
+  let key =
+    sprintf "libguestfs_fedora_specfile_pushed_%s_%s" branch version.version in
 
   target (memory_exists key);
   onrun (fun () -> memory_set key "1");