From 06a2a46f813a73d1e9427104fb5ffb40ec25709c Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sun, 23 Sep 2012 19:04:39 +0100
Subject: Fixes for release vs CI builds

---
 jenkinstool | 28 +++++++++++++++++++++-------
 1 file changed, 21 insertions(+), 7 deletions(-)

(limited to 'jenkinstool')

diff --git a/jenkinstool b/jenkinstool
index 84693b1..4098767 100755
--- a/jenkinstool
+++ b/jenkinstool
@@ -165,9 +165,13 @@ then
             esac
             basetgz="$pbuilder_release_tgz"
             debian_dist="%(host.debian-dist)s"
+            if [ "$debian_dist" != unstable ]
+            then
+                debianversion="$debianversion.$debian_dist"
+            fi
         else
-            debianversion="${version}-1.%(host.debian-dist)s"
             basetgz="$pbuilder_ci_tgz"
+            debianversion="${version}-1.%(host.debian-dist)s"
             debian_dist="%(host.debian-dist)s-ci"
         fi
 
@@ -316,7 +320,7 @@ echo "Creating/updating pbuilder tarballs."
 setup_pbuilder()
 {
     local basetgz="$1"
-    local flavor="$2"
+    local releaseonly="$2"
     local dist="%(host.debian-dist)s"
 
     if [ -e "$basetgz" ]
@@ -333,22 +337,32 @@ setup_pbuilder()
     else
         opts="--create"
     fi
-
+    
     if %(global.pretend)s
     then
         echo "PRETEND: pbuilder create/update $basetgz"
+    elif [ "$releaseonly" = yes ]
+    then
+        sudo pbuilder $opts \
+            --basetgz "$basetgz" \
+            --distribution "$dist" \
+            --mirror "%(global.debian-mirror)s"  \
+            --othermirror \
+                "deb %(global.artifacts-url)s/debian $dist main"
     else
         sudo pbuilder $opts \
             --basetgz "$basetgz" \
             --distribution "$dist" \
             --mirror "%(global.debian-mirror)s"  \
             --othermirror \
-                "deb %(global.artifacts-url)s/debian $dist$flavor main"
+                "deb %(global.artifacts-url)s/debian $dist main" \
+            --othermirror \
+                "deb %(global.artifacts-url)s/debian ${dist}-ci main"
     fi
 }
 
-setup_pbuilder "$pbuilder_ci_tgz" "-ci"
-setup_pbuilder "$pbuilder_release_tgz" ""
+setup_pbuilder "$pbuilder_ci_tgz" no
+setup_pbuilder "$pbuilder_release_tgz" yes
 ''')
 
         return jc
@@ -526,7 +540,7 @@ then
     exit 0
 else
     wget -O "../$origtgz" "$project_url/$tarball"
-    if ! is_release "$project" "$version"
+    if ! is_release "$project" "$version" || [ "$debian_dist" != unstable ]
     then
         dch -v "$debianversion" --distribution "$debian_dist" "CI build"
         dch -r ''
-- 
cgit v1.2.1