fedora: Increase timeout for koji wait-repo commands.

[goals.git] / stdlib / fedora.gl

diff --git a/stdlib/fedora.gl b/stdlib/fedora.gl
index 3b82cf6..8bcc09a 100644 (file)
--- a/stdlib/fedora.gl
+++ b/stdlib/fedora.gl
@@ -103,7 +103,7 @@ is-koji-built ("%pkg") :
     # before we can start the new build.
     for p in %<; do
         nvr=$(koji --quiet latest-build %fedora-tag $p | awk '{print $1}')
-        koji wait-repo %fedora-tag --build=$nvr
+        while ! koji wait-repo --timeout=10000 %fedora-tag --build=$nvr; do sleep 1m; done
     done
 
     # Make sure the local directory is up to date.
@@ -111,15 +111,24 @@ is-koji-built ("%pkg") :
     # would need to be corrected/integrated by hand.
     git pull
 
+    # If we're not building for Rawhide then we must use the rightmost
+    # (-r) flag so there's an upgrade path to Rawhide.
+    rightmost=
+    if test %fedora-branch != "master"; then rightmost=-r; fi
+
     # If the specfile doesn't have the magic string then add
     # that now.
     if ! grep -sq %fedora-rebuild-name $specfile; then
-        rpmdev-bumpspec -c "- "%fedora-rebuild-name *.spec
+        rpmdev-bumpspec -c "- "%fedora-rebuild-name $rightmost *.spec
     else
-        rpmdev-bumpspec -c "- Bump release and rebuild." *.spec
+        rpmdev-bumpspec -c "- Bump release and rebuild." $rightmost *.spec
     fi
+
+    # Commit and push the change.
     fedpkg commit -c
     fedpkg push
+
+    # Do the Koji build in the side tag.
     fedpkg build --target %fedora-tag
 }