chiark / gitweb /
Merge branch 'licenses' into 'master'
[fdroidserver.git] / makebuildserver
1 #!/usr/bin/env python2
2
3 import os
4 import sys
5 import subprocess
6 import time
7 import hashlib
8 from optparse import OptionParser
9
10
11 def vagrant(params, cwd=None, printout=False):
12     """Run vagrant.
13
14     :param: list of parameters to pass to vagrant
15     :cwd: directory to run in, or None for current directory
16     :printout: True to print output in realtime, False to just
17                return it
18     :returns: (ret, out) where ret is the return code, and out
19                is the stdout (and stderr) from vagrant
20     """
21     p = subprocess.Popen(['vagrant'] + params, cwd=cwd,
22                          stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
23     out = ''
24     if printout:
25         while True:
26             line = p.stdout.readline()
27             if len(line) == 0:
28                 break
29             print line,
30             out += line
31         p.wait()
32     else:
33         out = p.communicate()[0]
34     return (p.returncode, out)
35
36 boxfile = 'buildserver.box'
37 serverdir = 'buildserver'
38
39 parser = OptionParser()
40 parser.add_option("-v", "--verbose", action="store_true", default=False,
41                   help="Spew out even more information than normal")
42 parser.add_option("-c", "--clean", action="store_true", default=False,
43                   help="Build from scratch, rather than attempting to update the existing server")
44 options, args = parser.parse_args()
45
46 # set up default config
47 cachedir = os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver')
48 config = {
49     'arch64': False,
50     'basebox': 'jessie32',
51     # TODO in py3, convert this to pathlib.Path(absolute_path_string).as_uri()
52     'baseboxurl': [
53         'file://' + os.path.join(cachedir, 'jessie32.box'),
54         'https://f-droid.org/jessie32.box',
55     ],
56     'debian_mirror': 'http://http.debian.net/debian/',
57     'boot_timeout': 600,
58     'cachedir': cachedir,
59     'cpus': 1,
60     'memory': 3584,
61 }
62
63 # load config file, if present
64 if os.path.exists('makebuildserver.config.py'):
65     execfile('makebuildserver.config.py', config)
66 elif os.path.exists('makebs.config.py'):
67     # this is the old name for the config file
68     execfile('makebs.config.py', config)
69
70 if not os.path.exists('makebuildserver') or not os.path.exists(serverdir):
71     print 'This must be run from the correct directory!'
72     sys.exit(1)
73
74 if os.path.exists(boxfile):
75     os.remove(boxfile)
76
77 if options.clean:
78     vagrant(['destroy', '-f'], cwd=serverdir, printout=options.verbose)
79
80 # Update cached files.
81 cachedir = config['cachedir']
82 if not os.path.exists(cachedir):
83     os.makedirs(cachedir, 0755)
84
85 cachefiles = [
86     ('android-sdk_r24.4.1-linux.tgz',
87      'https://dl.google.com/android/android-sdk_r24.4.1-linux.tgz',
88      'e16917ad685c1563ccbc5dd782930ee1a700a1b6a6fd3e44b83ac694650435e9'),
89     ('android-platform-3.zip',
90      'https://dl.google.com/android/repository/android-1.5_r04-linux.zip',
91      '85b6c8f9797e56aa415d3a282428bb640c96b0acb17c11d41621bb2a5302fe64'),
92     ('android-platform-4.zip',
93      'https://dl.google.com/android/repository/android-1.6_r03-linux.zip',
94      'a8c4e3b32269c6b04c2adeabd112fce42f292dab1a40ef3b08ea7d4212be0df4'),
95     ('android-platform-5.zip',
96      'https://dl.google.com/android/repository/android-2.0_r01-linux.zip',
97      'e70e2151b49613f23f40828c771ab85e241eed361cab037c6312df77f2612f0a'),
98     ('android-platform-6.zip',
99      'https://dl.google.com/android/repository/android-2.0.1_r01-linux.zip',
100      'f47b46177b17f6368461f85bc2a27d0d2c437929f588ea27105712bc3185f664'),
101     ('android-platform-7.zip',
102      'https://dl.google.com/android/repository/android-2.1_r03-linux.zip',
103      'b9cc140a9b879586181b22cfc7d4aa18b979251e16e9b17771c5d0acb71ba940'),
104     ('android-platform-8.zip',
105      'https://dl.google.com/android/repository/android-2.2_r03-linux.zip',
106      '7c9ea1bd7cb225504bd085d7c93ae27d52bd88d29b621d28108f82fef68177c0'),
107     ('android-platform-9.zip',
108      'https://dl.google.com/android/repository/android-2.3.1_r02-linux.zip',
109      'b2ab4896d0a4857e4f688f69eb08b0e1a8074709d4445a92a83ece7ec7cd198c'),
110     ('android-platform-10.zip',
111      'https://dl.google.com/android/repository/android-2.3.3_r02-linux.zip',
112      '54bdb0f1ca06ba5747061ddeea20f431af72c448334fd4d3d7f84ea2ccd29fea'),
113     ('android-platform-11.zip',
114      'https://dl.google.com/android/repository/android-3.0_r02-linux.zip',
115      '1cacae7b6e1b5a5d73c06f5d29d2ea92d16674df8fd5507681290e77d1647a1c'),
116     ('android-platform-12.zip',
117      'https://dl.google.com/android/repository/android-3.1_r03-linux.zip',
118      '7570c86a86488a146aa2141a65a24d81800959c1907ff4f1d2c13bbafab230c5'),
119     ('android-platform-13.zip',
120      'https://dl.google.com/android/repository/android-3.2_r01-linux.zip',
121      'ff6b26ad34d7060a72ba504b0314cef8ba3138005561705adec5ad470a073d9b'),
122     ('android-platform-14.zip',
123      'https://dl.google.com/android/repository/android-14_r04.zip',
124      'da1af15c77ba41d062eb6d0ef5921cc424ab6167587033b830609d65f04802b6'),
125     ('android-platform-15.zip',
126      'https://dl.google.com/android/repository/android-15_r05.zip',
127      '5bc1f93aae86b4336ffc4cae9eb8ec41a9a8fd677582dd86a9629798f019bed9'),
128     ('android-platform-16.zip',
129      'https://dl.google.com/android/repository/android-16_r05.zip',
130      'fd7f269a423d1f1d079eabf9f918ceab49108702a1c6bb2589d57c23393503d3'),
131     ('android-platform-17.zip',
132      'https://dl.google.com/android/repository/android-17_r03.zip',
133      'b66e73fb2639f8c916fde4369aa29012a5c531e156dbb205fe3788fe998fbbe8'),
134     ('android-platform-18.zip',
135      'https://dl.google.com/android/repository/android-18_r03.zip',
136      '166ae9cf299747a5faa8f04168f0ee47cd7466a975d8b44acaaa62a43e767568'),
137     ('android-platform-19.zip',
138      'https://dl.google.com/android/repository/android-19_r04.zip',
139      '5efc3a3a682c1d49128daddb6716c433edf16e63349f32959b6207524ac04039'),
140     ('android-platform-20.zip',
141      'https://dl.google.com/android/repository/android-20_r02.zip',
142      'ef08c453e16ab6e656cf5d9413ef61cb8c650607d33b24ee4ce08dafdfe965a7'),
143     ('android-platform-21.zip',
144      'https://dl.google.com/android/repository/android-21_r02.zip',
145      'a76cd7ad3080ac6ce9f037cb935b399a1bad396c0605d4ff42f693695f1dcefe'),
146     ('android-platform-22.zip',
147      'https://dl.google.com/android/repository/android-22_r02.zip',
148      '45eb581bbe53c9256f34c26b2cea919543c0079140897ac721cf88c0b9f6789e'),
149     ('android-platform-23.zip',
150      'https://dl.google.com/android/repository/android-23_r01.zip',
151      '16e828bec35521f5529c998a6d312aaa6155cd4aabb5507d9eb2d4b3c9a1aff0'),
152     ('build-tools-17.0.0.zip',
153      'https://dl.google.com/android/repository/build-tools_r17-linux.zip',
154      '4c8444972343a19045236f6924bd7f12046287c70dace96ab88b2159c8ec0e74'),
155     ('build-tools-18.0.1.zip',
156      'https://dl.google.com/android/repository/build-tools_r18.0.1-linux.zip',
157      'a9b7b1bdfd864780fdd03fa1683f3fe712a4276cf200646833808cb9159bafc0'),
158     ('build-tools-18.1.0.zip',
159      'https://dl.google.com/android/repository/build-tools_r18.1-linux.zip',
160      '0753606738f31cc346426db1d46b7d021bc1bdaff63085f9ee9d278ee054d3c9'),
161     ('build-tools-18.1.1.zip',
162      'https://dl.google.com/android/repository/build-tools_r18.1.1-linux.zip',
163      '7e4ed326b53078f4f23276ddab52c400011f7593dfbb6508c0a6671954dba8b0'),
164     ('build-tools-19.0.0.zip',
165      'https://dl.google.com/android/repository/build-tools_r19-linux.zip',
166      '9442e1c5212ed594e344a231fa93e7a017a5ef8cc661117011f1d3142eca7acc'),
167     ('build-tools-19.0.1.zip',
168      'https://dl.google.com/android/repository/build-tools_r19.0.1-linux.zip',
169      'b068edaff05c3253a63e9c8f0e1786429799b7e4b01514a847a8b291beb9232e'),
170     ('build-tools-19.0.2.zip',
171      'https://dl.google.com/android/repository/build-tools_r19.0.2-linux.zip',
172      '06124fad0d4bde21191240d61df2059a8546c085064a9a57d024c36fa2c9bebb'),
173     ('build-tools-19.0.3.zip',
174      'https://dl.google.com/android/repository/build-tools_r19.0.3-linux.zip',
175      'bc9b3db0de4a3e233a170274293359051a758f1e3f0d0d852ff4ad6d90d0a794'),
176     ('build-tools-19.1.0.zip',
177      'https://dl.google.com/android/repository/build-tools_r19.1-linux.zip',
178      '3833b409f78c002a83244e220be380ea6fa44d604e0d47de4b7e5daefe7cd3f4'),
179     ('build-tools-20.0.0.zip',
180      'https://dl.google.com/android/repository/build-tools_r20-linux.zip',
181      '296e09d62095d80e6eaa06a64cfa4c6f9f317c2d67ad8da6514523ec66f5c871'),
182     ('build-tools-21.0.0.zip',
183      'https://dl.google.com/android/repository/build-tools_r21-linux.zip',
184      '12b818f38fe1b68091b94545988317438efbf41eb61fd36b72cd79f536044065'),
185     ('build-tools-21.0.1.zip',
186      'https://dl.google.com/android/repository/build-tools_r21.0.1-linux.zip',
187      'a8922e80d3dd0cf6df14b29a7862448fa111b48086c639168d4b18c92431f559'),
188     ('build-tools-21.0.2.zip',
189      'https://dl.google.com/android/repository/build-tools_r21.0.2-linux.zip',
190      '859b17a6b65d063dfd86c163489b736b12bdeecd9173fdddb3e9f32e0fe584b7'),
191     ('build-tools-21.1.0.zip',
192      'https://dl.google.com/android/repository/build-tools_r21.1-linux.zip',
193      '022a85b92360272379b2f04b8a4d727e754dbe7eb8ab5a9568190e33e480d8f1'),
194     ('build-tools-21.1.1.zip',
195      'https://dl.google.com/android/repository/build-tools_r21.1.1-linux.zip',
196      '29b612484de6b5cde0df6de655e413f7611b0557b440538397afa69b557e2f08'),
197     ('build-tools-21.1.2.zip',
198      'https://dl.google.com/android/repository/build-tools_r21.1.2-linux.zip',
199      '3f88efc2d5316fb73f547f35b472610eed5e6f3f56762750ddad1c7d1d81660d'),
200     ('build-tools-22.0.0.zip',
201      'https://dl.google.com/android/repository/build-tools_r22-linux.zip',
202      '061c021243f04c80c19568a6e3a027c00d8e269c9311d7bf07fced60fbde7bd5'),
203     ('build-tools-22.0.1.zip',
204      'https://dl.google.com/android/repository/build-tools_r22.0.1-linux.zip',
205      '91e5524bf227aad1135ddd10905518ac49f74797d33d48920dcf8364b9fde214'),
206     ('build-tools-23.0.0.zip',
207      'https://dl.google.com/android/repository/build-tools_r23-linux.zip',
208      '56bf4fc6c43638c55fef4a0937bad38281945725459841879b436c6922df786c'),
209     ('build-tools-23.0.1.zip',
210      'https://dl.google.com/android/repository/build-tools_r23.0.1-linux.zip',
211      'e56b3ef7b760ad06a7cee9b2d52ba7f43133dcecedfa5357f8845b3a80aeeecf'),
212     ('build-tools-23.0.2.zip',
213      'https://dl.google.com/android/repository/build-tools_r23.0.2-linux.zip',
214      '82754f551a6e36eaf516fbdd00c95ff0ccd19f81d1e134125b6ac4916f7ed9b6'),
215     # the binaries that Google uses are here:
216     # https://android.googlesource.com/platform/tools/external/gradle/+/studio-1.5/
217     ('gradle-1.4-bin.zip',
218      'https://services.gradle.org/distributions/gradle-1.4-bin.zip',
219      'cd99e85fbcd0ae8b99e81c9992a2f10cceb7b5f009c3720ef3a0078f4f92e94e'),
220     ('gradle-1.6-bin.zip',
221      'https://services.gradle.org/distributions/gradle-1.6-bin.zip',
222      'de3e89d2113923dcc2e0def62d69be0947ceac910abd38b75ec333230183fac4'),
223     ('gradle-1.7-bin.zip',
224      'https://services.gradle.org/distributions/gradle-1.7-bin.zip',
225      '360c97d51621b5a1ecf66748c718594e5f790ae4fbc1499543e0c006033c9d30'),
226     ('gradle-1.8-bin.zip',
227      'https://services.gradle.org/distributions/gradle-1.8-bin.zip',
228      'a342bbfa15fd18e2482287da4959588f45a41b60910970a16e6d97959aea5703'),
229     ('gradle-1.9-bin.zip',
230      'https://services.gradle.org/distributions/gradle-1.9-bin.zip',
231      '097ddc2bcbc9da2bb08cbf6bf8079585e35ad088bafd42e8716bc96405db98e9'),
232     ('gradle-1.10-bin.zip',
233      'https://services.gradle.org/distributions/gradle-1.10-bin.zip',
234      '6e6db4fc595f27ceda059d23693b6f6848583950606112b37dfd0e97a0a0a4fe'),
235     ('gradle-1.11-bin.zip',
236      'https://services.gradle.org/distributions/gradle-1.11-bin.zip',
237      '07e235df824964f0e19e73ea2327ce345c44bcd06d44a0123d29ab287fc34091'),
238     ('gradle-1.12-bin.zip',
239      'https://services.gradle.org/distributions/gradle-1.12-bin.zip',
240      '8734b13a401f4311ee418173ed6ca8662d2b0a535be8ff2a43ecb1c13cd406ea'),
241     ('gradle-2.1-bin.zip',
242      'https://services.gradle.org/distributions/gradle-2.1-bin.zip',
243      '3eee4f9ea2ab0221b89f8e4747a96d4554d00ae46d8d633f11cfda60988bf878'),
244     ('gradle-2.2.1-bin.zip',
245      'https://services.gradle.org/distributions/gradle-2.2.1-bin.zip',
246      '420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418'),
247     ('gradle-2.3-bin.zip',
248      'https://services.gradle.org/distributions/gradle-2.3-bin.zip',
249      '010dd9f31849abc3d5644e282943b1c1c355f8e2635c5789833979ce590a3774'),
250     ('gradle-2.4-bin.zip',
251      'https://services.gradle.org/distributions/gradle-2.4-bin.zip',
252      'c4eaecc621a81f567ded1aede4a5ddb281cc02a03a6a87c4f5502add8fc2f16f'),
253     ('gradle-2.5-bin.zip',
254      'https://services.gradle.org/distributions/gradle-2.5-bin.zip',
255      '3f953e0cb14bb3f9ebbe11946e84071547bf5dfd575d90cfe9cc4e788da38555'),
256     ('gradle-2.6-bin.zip',
257      'https://services.gradle.org/distributions/gradle-2.6-bin.zip',
258      '18a98c560af231dfa0d3f8e0802c20103ae986f12428bb0a6f5396e8f14e9c83'),
259     ('gradle-2.7-bin.zip',
260      'https://services.gradle.org/distributions/gradle-2.7-bin.zip',
261      'cde43b90945b5304c43ee36e58aab4cc6fb3a3d5f9bd9449bb1709a68371cb06'),
262     ('gradle-2.8-bin.zip',
263      'https://services.gradle.org/distributions/gradle-2.8-bin.zip',
264      'a88db9c2f104defdaa8011c58cf6cda6c114298ae3695ecfb8beb30da3a903cb'),
265     ('gradle-2.9-bin.zip',
266      'https://services.gradle.org/distributions/gradle-2.9-bin.zip',
267      'c9159ec4362284c0a38d73237e224deae6139cbde0db4f0f44e1c7691dd3de2f'),
268     ('gradle-2.10-bin.zip',
269      'https://services.gradle.org/distributions/gradle-2.10-bin.zip',
270      '66406247f745fc6f05ab382d3f8d3e120c339f34ef54b86f6dc5f6efc18fbb13'),
271     ('Kivy-1.7.2.tar.gz',
272      'https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
273      '0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),
274 ]
275
276 if config['arch64']:
277     cachefiles.extend([
278         ('android-ndk-r10e-linux-x86_64.bin',
279          'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
280          '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
281         ('android-ndk-r9b-linux-x86_64.tar.bz2',
282          'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
283          '8956e9efeea95f49425ded8bb697013b66e162b064b0f66b5c75628f76e0f532'),
284         ('android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
285          'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64-legacy-toolchains.tar.bz2',
286          'de93a394f7c8f3436db44568648f87738a8d09801a52f459dcad3fc047e045a1')])
287 else:
288     cachefiles.extend([
289         ('android-ndk-r10e-linux-x86.bin',
290          'https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86.bin',
291          '92b07d25aaad9b341a7f2b2a62402d508e948bf2dea3ee7b65a6aeb18bca7df5'),
292         ('android-ndk-r9b-linux-x86.tar.bz2',
293          'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86.tar.bz2',
294          '748104b829dd12afb2fdb3044634963abb24cdb0aad3b26030abe2e9e65bfc81'),
295         ('android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
296          'https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86-legacy-toolchains.tar.bz2',
297          '606aadf815ae28cc7b0154996247c70d609f111b14e44bcbcd6cad4c87fefb6f')])
298 wanted = []
299
300
301 def sha256_for_file(path):
302     with open(path, 'r') as f:
303         s = hashlib.sha256()
304         while True:
305             data = f.read(4096)
306             if not data:
307                 break
308             s.update(data)
309         return s.hexdigest()
310
311 for f, src, shasum in cachefiles:
312     relpath = os.path.join(cachedir, f)
313     # if download fails to connect, it'll make a zero size file
314     if os.path.exists(relpath) and os.stat(relpath).st_size == 0:
315         os.remove(relpath)
316     if not os.path.exists(relpath):
317         print "Downloading " + f + " to cache"
318         if subprocess.call(['wget', src, '-O', f], cwd=cachedir) != 0:
319             print "...download of " + f + " failed."
320             sys.exit(1)
321     if shasum:
322         v = sha256_for_file(relpath)
323         if v != shasum:
324             print "Invalid shasum of '" + v + "' detected for " + f
325             sys.exit(1)
326         else:
327             print "...shasum verified for " + f
328
329     wanted.append(f)
330
331 # allow specifying a list/tuple that includes cached local copy
332 if type(config['baseboxurl']) in (list, tuple) or config['baseboxurl'][0] in ('(', '['):
333     baseboxurl = config['baseboxurl']
334 else:
335     baseboxurl = '"{0}"'.format(config['baseboxurl'])
336
337 # Generate an appropriate Vagrantfile for the buildserver, based on our
338 # settings...
339 vagrantfile = """
340 Vagrant.configure("2") do |config|
341
342   if Vagrant.has_plugin?("vagrant-cachier")
343     config.cache.scope = :box
344     config.cache.auto_detect = false
345     config.cache.enable :apt
346     config.cache.enable :chef
347   end
348
349   config.vm.box = "{0}"
350   config.vm.box_url = {1}
351
352   config.vm.provider "virtualbox" do |v|
353     v.customize ["modifyvm", :id, "--memory", "{2}"]
354     v.customize ["modifyvm", :id, "--cpus", "{3}"]
355   end
356
357   config.vm.boot_timeout = {4}
358
359   config.vm.provision :shell, :path => "fixpaths.sh"
360 """.format(config['basebox'],
361            baseboxurl,
362            config['memory'],
363            config.get('cpus', 1),
364            config['boot_timeout'])
365 if 'aptproxy' in config and config['aptproxy']:
366     vagrantfile += """
367   config.vm.provision :shell, :inline => 'sudo echo "Acquire::http {{ Proxy \\"{0}\\"; }};" > /etc/apt/apt.conf.d/02proxy && sudo apt-get update'
368 """.format(config['aptproxy'])
369
370 vagrantfile += """
371   config.vm.provision :chef_solo do |chef|
372     chef.cookbooks_path = "cookbooks"
373     chef.log_level = :debug
374     chef.json = {
375       :settings => {
376         :sdk_loc => "/home/vagrant/android-sdk",
377         :ndk_loc => "/home/vagrant/android-ndk",
378         :debian_mirror => "%s",
379         :user => "vagrant"
380       }
381     }
382     chef.add_recipe "fdroidbuild-general"
383     chef.add_recipe "android-sdk"
384     chef.add_recipe "android-ndk"
385     chef.add_recipe "gradle"
386     chef.add_recipe "kivy"
387   end
388 end
389 """ % (config['debian_mirror'])
390
391 # Check against the existing Vagrantfile, and if they differ, we need to
392 # create a new box:
393 vf = os.path.join(serverdir, 'Vagrantfile')
394 writevf = True
395 if os.path.exists(vf):
396     vagrant(['halt'], serverdir)
397     with open(vf, 'r') as f:
398         oldvf = f.read()
399     if oldvf != vagrantfile:
400         print "Server configuration has changed, rebuild from scratch is required"
401         vagrant(['destroy', '-f'], serverdir)
402     else:
403         print "Re-provisioning existing server"
404         writevf = False
405 else:
406     print "No existing server - building from scratch"
407 if writevf:
408     with open(vf, 'w') as f:
409         f.write(vagrantfile)
410
411
412 print "Configuring build server VM"
413 returncode, out = vagrant(['up', '--provision'], serverdir, printout=True)
414 with open(os.path.join(serverdir, 'up.log'), 'w') as log:
415     log.write(out)
416 if returncode != 0:
417     print "Failed to configure server"
418     sys.exit(1)
419
420 print "Writing buildserver ID"
421 p = subprocess.Popen(['git', 'rev-parse', 'HEAD'], stdout=subprocess.PIPE)
422 buildserverid = p.communicate()[0].strip()
423 print "...ID is " + buildserverid
424 subprocess.call(
425     ['vagrant', 'ssh', '-c', 'sh -c "echo {0} >/home/vagrant/buildserverid"'
426         .format(buildserverid)],
427     cwd=serverdir)
428
429 print "Stopping build server VM"
430 vagrant(['halt'], serverdir)
431
432 print "Waiting for build server VM to be finished"
433 ready = False
434 while not ready:
435     time.sleep(2)
436     returncode, out = vagrant(['status'], serverdir)
437     if returncode != 0:
438         print "Error while checking status"
439         sys.exit(1)
440     for line in out.splitlines():
441         if line.startswith("default"):
442             if line.find("poweroff") != -1:
443                 ready = True
444             else:
445                 print "Status: " + line
446
447 print "Packaging"
448 vagrant(['package', '--output', os.path.join('..', boxfile)], serverdir,
449         printout=options.verbose)
450 print "Adding box"
451 vagrant(['box', 'add', 'buildserver', boxfile, '-f'],
452         printout=options.verbose)
453
454 os.remove(boxfile)