From 7d538161103a7f40bf5a2012625dd1d5de9fbcc1 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Sat, 15 Sep 2012 22:38:52 +0100
Subject: Upload to right distro (ci vs release)

Also, use the CI distro in sources.list.
---
 jenkinstool | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'jenkinstool')

diff --git a/jenkinstool b/jenkinstool
index 06e5594..77288a3 100755
--- a/jenkinstool
+++ b/jenkinstool
@@ -162,9 +162,11 @@ then
                     ;;
             esac
             basetgz="$pbuilder_release_tgz"
+            debian_dist="%(host.debian-dist)s"
         else
             debianversion="${version}-1.%(host.debian-dist)s"
             basetgz="$pbuilder_ci_tgz"
+            debian_dist="%(host.debian-dist)s-ci"
         fi
 
         debianurl="%(global.artifacts-url)s/debian"
@@ -320,7 +322,7 @@ Uploaders: uploaders
 Tracking: keep includechanges
 
 Codename: %(dist)s-ci
-Suite: %(dist)s
+Suite: %(dist)s-ci
 Origin: code.liw.fi
 Description: CI builds
 Architectures: source %(archs)s
@@ -339,10 +341,11 @@ cat <<end > "$base/conf/incoming"
 Name: default
 IncomingDir: incoming
 TempDir: incoming.temp
-Allow: %(dists)s
+Allow: %(dists)s %(cidists)s
 end
 ''' % {
     'dists': ' '.join(dists),
+    'cidists': ' '.join('%s-ci' % dist for dist in dists),
 }
 
         script += '''
@@ -467,7 +470,7 @@ setup_pbuilder "$pbuilder_release_tgz" ""
 
         jc.add_ssh_command('''
 cat << EOF | sudo tee /etc/apt/sources.list.d/jenkinstool.list
-deb %(global.artifacts-url)s/debian %(host.debian-dist)s main
+deb %(global.artifacts-url)s/debian %(host.debian-dist)s-ci main
 EOF
 
 sudo apt-get update || true
@@ -579,7 +582,7 @@ else
     wget -O "../$origtgz" "$project_url/$tarball"
     if ! is_release "$project" "$version"
     then
-        dch -v "$debianversion" --distribution "%(host.debian-dist)s" "CI build"
+        dch -v "$debianversion" --distribution "$debian_dist" "CI build"
         dch -r ''
     fi
     debuild -S -us -uc -i
-- 
cgit v1.2.1