From 5cfa9c893e92d8d765c01e766f3ac3ffe5de32e3 Mon Sep 17 00:00:00 2001
From: Lars Wirzenius <liw@liw.fi>
Date: Fri, 3 Oct 2014 15:07:11 +0100
Subject: Make disks 8G in size, so they don't fill all the time

Plus other changes, accidentally committed.
---
 jenkinstool              | 15 +++++++++++----
 jenkinstool-real.conf    |  1 +
 liw-real.conf            |  2 +-
 vm-data/common.conf      |  2 +-
 vm-data/wheezy-i386.conf |  1 -
 5 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/jenkinstool b/jenkinstool
index 4311eb6..289c348 100755
--- a/jenkinstool
+++ b/jenkinstool
@@ -215,11 +215,13 @@ class JobGenerator(object):
 
     '''Generate Jenkins jobs from a JSON specification file.'''
 
-    def __init__(self, pretend, pbuilder_max_age, artifacts_url, jenkins_host):
+    def __init__(self, pretend, pbuilder_max_age, artifacts_url,
+                 jenkins_host, debian_mirror):
         self.pretend = pretend
         self.pbuilder_max_age = pbuilder_max_age
         self.artifacts_url = artifacts_url
         self.jenkins_host = jenkins_host
+        self.debian_mirror = debian_mirror
 
     def generate_setup_jobs(self, config):
         '''Generate all the shared jobs to setup Jenkins.
@@ -731,7 +733,7 @@ rm -rf "$temp"
             'artifacts-url': self.artifacts_url,
             'dput-host': self.jenkins_host,
             'repreprobase': '/var/www/jenkins/debian',
-            'debian-mirror': 'http://cdn.debian.net/debian',
+            'debian-mirror': self.debian_mirror,
             'pretend': 'true' if self.pretend else 'false',
             'pbuilder-max-age': str(self.pbuilder_max_age),
         })
@@ -755,6 +757,7 @@ rm -rf "$temp"
         jc.add_shell_command(
             no_vcs_copy + prelude + 'cp -a "$vcsworkspace/." .')
 
+
 class JenkinsTool(cliapp.Application):
 
     '''Manipulate jobs in running Jenkins CI server.'''
@@ -771,6 +774,10 @@ class JenkinsTool(cliapp.Application):
         self.settings.string(
             ['jenkins-host'],
             'address of host running jenkins')
+        self.settings.string(
+            ['mirror'],
+            'what Debian mirror to use',
+            default='http://cdn.debian.net/debian')
 
     @property
     def jenkins_url(self):
@@ -870,7 +877,8 @@ class JenkinsTool(cliapp.Application):
         job_generator = JobGenerator(self.settings['pretend-jobs'],
                                      self.settings['pbuilder-max-age'],
                                      self.artifacts_url,
-                                     self.settings['jenkins-host'])
+                                     self.settings['jenkins-host'],
+                                     self.settings['mirror'])
 
         with open(filename) as f:
             try:
@@ -940,4 +948,3 @@ class JenkinsTool(cliapp.Application):
         ts.finish()
 
 JenkinsTool(version=simplejenkinsapi.__version__).run()
-
diff --git a/jenkinstool-real.conf b/jenkinstool-real.conf
index b55021e..38765f6 100644
--- a/jenkinstool-real.conf
+++ b/jenkinstool-real.conf
@@ -1,3 +1,4 @@
 [config]
 log = /mnt/scratch/liw-scratch/jenkinstool.log
 jenkins-host = jenkins
+mirror = http://192.168.122.1/debian
diff --git a/liw-real.conf b/liw-real.conf
index e88e09c..27b948d 100644
--- a/liw-real.conf
+++ b/liw-real.conf
@@ -164,7 +164,7 @@
                 "cmdtest"
             ],
             "build-commands": [
-                "./check -uylLs"
+                "./check -uys"
             ]
         },
         {
diff --git a/vm-data/common.conf b/vm-data/common.conf
index c927df3..756c73e 100644
--- a/vm-data/common.conf
+++ b/vm-data/common.conf
@@ -2,5 +2,5 @@
 log = vmdebootstrap.log
 mirror = http://192.168.122.1/debian
 enable-dhcp = yes
-size = 4G
+size = 8G
 verbose = yes
diff --git a/vm-data/wheezy-i386.conf b/vm-data/wheezy-i386.conf
index 65d0dd9..45e5661 100644
--- a/vm-data/wheezy-i386.conf
+++ b/vm-data/wheezy-i386.conf
@@ -5,4 +5,3 @@ hostname = jenkins-wheezy-i386
 image = jenkins-wheezy-i386.img
 customize = vm-data/worker.customize
 package = acpid, acpi-support-base, build-essential, bzr, git, debhelper, devscripts, ssh, vim, less, rsync, pbuilder, fakeroot, dput, sudo, python-bottle
-
-- 
cgit v1.2.1