X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=libguestfs_fedora.ml;h=dbcda32b2a628e5d3511b53c038ca24e91341f5e;hb=c05c364daae242827b9e432c4bfe2f7cda8ddae0;hp=18777a83720f4059afd210761e167c3347afe21b;hpb=8e4d36a8ec04de7ec2ae22f336708adb537a7e59;p=goaljobs-goals.git

diff --git a/libguestfs_fedora.ml b/libguestfs_fedora.ml
index 18777a8..dbcda32 100644
--- a/libguestfs_fedora.ml
+++ b/libguestfs_fedora.ml
@@ -22,10 +22,12 @@ let package = "libguestfs"
 
 (* How branches in libguestfs upstream map to branches in Fedora. *)
 let branches = [
-  "1.23-development", "master";    (* Rawhide follows development. *)
-  "1.23-development", "f20";       (* F20 also follows development. *)
-  "1.22-stable", "f19";            (* F19 follows 1.22. *)
-  "1.20-stable", "f18";            (* F18 follows 1.20. *)
+  "1.37-development", "master";    (* Rawhide follows development. *)
+  "1.36-stable", "f26";            (* F26 follows 1.36. *)
+  "1.36-stable", "f25";            (* F25 follows 1.36. *)
+  "1.34-stable", "f24";            (* F24 follows 1.34. *)
+  "1.32-stable", "f23";            (* F23 follows 1.32. *)
+  "1.30-stable", "f22";            (* F22 follows 1.30. *)
 ]
 
 (* Goal: Latest website version has been built in every branch. *)
@@ -43,7 +45,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);
@@ -64,7 +68,7 @@ and sources_uploaded version branch =
   sh "
     cd %s
     fedpkg new-sources %s/%s
-  " repodir libguestfs_website_cvs version.urlpath
+  " repodir libguestfs_website_repo version.urlpath
 
 and specfile_updated version branch =
   let repodir = fedora_repo package branch in
@@ -92,7 +96,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 +111,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");