mirror of
https://github.com/f-droid/fdroidserver.git
synced 2025-09-13 22:42:29 +03:00
buildserver: remove Kivy, unused since 2013 and out of date
This is the last thing using Chef, which adds a lot of time to the time it takes to fully provision the buildserver. This slows down development on the things we are actually using, like running all builds on jenkins.debian.net. #210 #165
This commit is contained in:
parent
91c1e8313f
commit
14de399bb7
5 changed files with 1 additions and 73 deletions
11
buildserver/Vagrantfile
vendored
11
buildserver/Vagrantfile
vendored
|
@ -23,8 +23,6 @@ Vagrant.configure("2") do |config|
|
||||||
|
|
||||||
config.vm.boot_timeout = configfile['boot_timeout']
|
config.vm.boot_timeout = configfile['boot_timeout']
|
||||||
|
|
||||||
config.vm.provision :shell, :path => "fixpaths.sh"
|
|
||||||
|
|
||||||
if configfile.has_key? "aptproxy"
|
if configfile.has_key? "aptproxy"
|
||||||
config.vm.provision :shell, path: "provision-apt-proxy",
|
config.vm.provision :shell, path: "provision-apt-proxy",
|
||||||
args: [configfile["aptproxy"]]
|
args: [configfile["aptproxy"]]
|
||||||
|
@ -47,15 +45,6 @@ Vagrant.configure("2") do |config|
|
||||||
args: ["/home/vagrant/android-sdk"]
|
args: ["/home/vagrant/android-sdk"]
|
||||||
config.vm.provision "shell", path: "provision-apt-get-install",
|
config.vm.provision "shell", path: "provision-apt-get-install",
|
||||||
args: [configfile['debian_mirror']]
|
args: [configfile['debian_mirror']]
|
||||||
|
|
||||||
config.vm.provision :chef_solo do |chef|
|
|
||||||
chef.channel = "stable"
|
|
||||||
chef.version = "12.10.24"
|
|
||||||
chef.cookbooks_path = "cookbooks"
|
|
||||||
chef.log_level = :debug
|
|
||||||
chef.add_recipe "kivy"
|
|
||||||
end
|
|
||||||
|
|
||||||
config.vm.provision "shell", path: "provision-android-sdk"
|
config.vm.provision "shell", path: "provision-android-sdk"
|
||||||
config.vm.provision "shell", path: "provision-android-ndk",
|
config.vm.provision "shell", path: "provision-android-ndk",
|
||||||
args: ["/home/vagrant/android-ndk"]
|
args: ["/home/vagrant/android-ndk"]
|
||||||
|
|
|
@ -1,34 +0,0 @@
|
||||||
|
|
||||||
%w{cython python-pygame python-pip python-virtualenv python-opengl python-gst0.10 python-enchant libgl1-mesa-dev libgles2-mesa-dev}.each do |pkg|
|
|
||||||
package pkg do
|
|
||||||
action :install
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
script "install-kivy" do
|
|
||||||
cwd "/tmp"
|
|
||||||
interpreter "bash"
|
|
||||||
code "
|
|
||||||
tar xf /vagrant/cache/Kivy-1.7.2.tar.gz
|
|
||||||
cd Kivy-1.7.2
|
|
||||||
python setup.py install
|
|
||||||
cd ..
|
|
||||||
rm -rf Kivy*
|
|
||||||
"
|
|
||||||
not_if "python -c 'import kivy'"
|
|
||||||
end
|
|
||||||
|
|
||||||
script "install-p4a" do
|
|
||||||
cwd "/home/vagrant"
|
|
||||||
interpreter "bash"
|
|
||||||
code "
|
|
||||||
git clone https://github.com/kivy/python-for-android
|
|
||||||
chown -R vagrant:vagrant python-for-android
|
|
||||||
cd python-for-android
|
|
||||||
git checkout ca369d774e2
|
|
||||||
"
|
|
||||||
not_if "test -d /home/vagrant/python-for-android"
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -1,25 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
|
|
||||||
echo $0
|
|
||||||
|
|
||||||
fixit()
|
|
||||||
{
|
|
||||||
#Fix sudoers so the PATH gets passed through, otherwise chef
|
|
||||||
#provisioning doesn't work.
|
|
||||||
if [ -z "$1" ]; then
|
|
||||||
export EDITOR=$0 && sudo -E visudo
|
|
||||||
else
|
|
||||||
echo "Fix sudoers"
|
|
||||||
echo "Defaults exempt_group=admin" >> $1
|
|
||||||
fi
|
|
||||||
#Stick the gems bin onto root's path as well.
|
|
||||||
sudo echo "PATH=$PATH:/var/lib/gems/1.8/bin" >>/root/.bashrc
|
|
||||||
# Restart sudo so it gets the changes straight away
|
|
||||||
sudo /etc/init.d/sudo restart
|
|
||||||
}
|
|
||||||
|
|
||||||
sudo grep "exempt_group" /etc/sudoers -q
|
|
||||||
if [ "$?" -eq "1" ]; then
|
|
||||||
fixit
|
|
||||||
fi
|
|
||||||
|
|
|
@ -12,7 +12,7 @@ if [ -z "$files" ]; then
|
||||||
PY_TEST_FILES="tests/*.TestCase"
|
PY_TEST_FILES="tests/*.TestCase"
|
||||||
SH_FILES="hooks/pre-commit"
|
SH_FILES="hooks/pre-commit"
|
||||||
BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion buildserver/provision-*"
|
BASH_FILES="fd-commit jenkins-build docs/update.sh completion/bash-completion buildserver/provision-*"
|
||||||
RB_FILES="buildserver/cookbooks/*/recipes/*.rb buildserver/Vagrantfile"
|
RB_FILES="buildserver/Vagrantfile"
|
||||||
else
|
else
|
||||||
# if actually committing right now, then only run on the files
|
# if actually committing right now, then only run on the files
|
||||||
# that are going to be committed at this moment
|
# that are going to be committed at this moment
|
||||||
|
|
|
@ -243,8 +243,6 @@ cachefiles = [
|
||||||
'cfc61eda71f2d12a572822644ce13d2919407595c2aec3e3566d2aab6f97ef39'),
|
'cfc61eda71f2d12a572822644ce13d2919407595c2aec3e3566d2aab6f97ef39'),
|
||||||
('https://services.gradle.org/distributions/gradle-3.0-bin.zip',
|
('https://services.gradle.org/distributions/gradle-3.0-bin.zip',
|
||||||
'39c906941a474444afbddc38144ed44166825acb0a57b0551dddb04bbf157f80'),
|
'39c906941a474444afbddc38144ed44166825acb0a57b0551dddb04bbf157f80'),
|
||||||
('https://pypi.python.org/packages/source/K/Kivy/Kivy-1.7.2.tar.gz',
|
|
||||||
'0485e2ef97b5086df886eb01f8303cb542183d2d71a159466f99ad6c8a1d03f1'),
|
|
||||||
('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
|
('https://dl.google.com/android/ndk/android-ndk-r10e-linux-x86_64.bin',
|
||||||
'102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
|
'102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
|
||||||
('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
|
('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue