mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-13 10:40:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'makebuildserver-caching-fixes' into 'master'

Browse source 
./makebuildserver CI fixes

These are fixes for caching and flexible config related to the work of getting `./makebuildserver` running on Debian's and Guardian Project's Jenkins boxes.  @mvdan and I have been working with h01lger to get that going, here's the latest build log: https://jenkins.debian.net/view/reproducible/job/reproducible_setup_fdroid_build_environment_profitbricks3/lastBuild/console

See merge request !91
This commit is contained in:
Daniel Martí 2016-01-26 11:00:58 +00:00
commit 88d369e293
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
View file

@ -7,7 +7,7 @@ execute 'set_debian_mirror' do
end end
execute "jessie_backports" do execute "jessie_backports" do
command "echo 'deb http://http.debian.net/debian jessie-backports main' > /etc/apt/sources.list.d/backports.list" command "echo 'deb #{debian_mirror} jessie-backports main' > /etc/apt/sources.list.d/backports.list"
only_if "grep jessie /etc/apt/sources.list" only_if "grep jessie /etc/apt/sources.list"
end end

13
makebuildserver
View file

@ -41,16 +41,19 @@ parser.add_option("-v", "--verbose", action="store_true", default=False,
help="Spew out even more information than normal") help="Spew out even more information than normal")
parser.add_option("-c", "--clean", action="store_true", default=False, parser.add_option("-c", "--clean", action="store_true", default=False,
help="Build from scratch, rather than attempting to update the existing server") help="Build from scratch, rather than attempting to update the existing server")
parser.add_option("--debian-mirror", default="http://http.debian.net/debian/",
help="Use the specified Debian mirror in the box's /etc/apt/sources.list.")
options, args = parser.parse_args() options, args = parser.parse_args()
# set up default config # set up default config
cachedir = os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver')
config = { config = {
'arch64': False, 'arch64': False,
'basebox': 'jessie32', 'basebox': 'jessie32',
'baseboxurl': 'https://f-droid.org/jessie32.box', # TODO in py3, convert this to pathlib.Path(absolute_path_string).as_uri()
'cachedir': os.path.join(os.getenv('HOME'), '.cache', 'fdroidserver'), 'baseboxurl': [
'file://' + os.path.join(cachedir, 'jessie32.box'),
'https://f-droid.org/jessie32.box',
],
'cachedir': cachedir,
'cpus': 1, 'cpus': 1,
'memory': 3584, 'memory': 3584,
} }
@ -378,7 +381,7 @@ vagrantfile += """
chef.add_recipe "kivy" chef.add_recipe "kivy"
end end
end end
""" % (options.debian_mirror) """ % (config['debian_mirror'])
# Check against the existing Vagrantfile, and if they differ, we need to # Check against the existing Vagrantfile, and if they differ, we need to
# create a new box: # create a new box: