From 14de399bb7114b824062f2e6618efaf09254588d Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 12 Sep 2016 13:05:05 +0200
Subject: [PATCH] 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
---
 buildserver/Vagrantfile                       | 11 ------
 buildserver/cookbooks/kivy/recipes/default.rb | 34 -------------------
 buildserver/fixpaths.sh                       | 25 --------------
 hooks/pre-commit                              |  2 +-
 makebuildserver                               |  2 --
 5 files changed, 1 insertion(+), 73 deletions(-)
 delete mode 100644 buildserver/cookbooks/kivy/recipes/default.rb
 delete mode 100644 buildserver/fixpaths.sh

diff --git a/buildserver/Vagrantfile b/buildserver/Vagrantfile
index 3e04fbc1..51db27d3 100644
--- a/buildserver/Vagrantfile
+++ b/buildserver/Vagrantfile
@@ -23,8 +23,6 @@ Vagrant.configure("2") do |config|
 
   config.vm.boot_timeout = configfile['boot_timeout']
 
-  config.vm.provision :shell, :path => "fixpaths.sh"
-
   if configfile.has_key? "aptproxy"
     config.vm.provision :shell, path: "provision-apt-proxy",
       args: [configfile["aptproxy"]]
@@ -47,15 +45,6 @@ Vagrant.configure("2") do |config|
     args: ["/home/vagrant/android-sdk"]
   config.vm.provision "shell", path: "provision-apt-get-install",
     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-ndk",
     args: ["/home/vagrant/android-ndk"]
diff --git a/buildserver/cookbooks/kivy/recipes/default.rb b/buildserver/cookbooks/kivy/recipes/default.rb
deleted file mode 100644
index 42699103..00000000
--- a/buildserver/cookbooks/kivy/recipes/default.rb
+++ /dev/null
@@ -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
-
-
-
diff --git a/buildserver/fixpaths.sh b/buildserver/fixpaths.sh
deleted file mode 100644
index b55fcdf8..00000000
--- a/buildserver/fixpaths.sh
+++ /dev/null
@@ -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
-
diff --git a/hooks/pre-commit b/hooks/pre-commit
index 45a5b052..e1449f6c 100755
--- a/hooks/pre-commit
+++ b/hooks/pre-commit
@@ -12,7 +12,7 @@ if [ -z "$files" ]; then
     PY_TEST_FILES="tests/*.TestCase"
     SH_FILES="hooks/pre-commit"
     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
     # if actually committing right now, then only run on the files
     # that are going to be committed at this moment
diff --git a/makebuildserver b/makebuildserver
index 9ecfa711..492ef6e1 100755
--- a/makebuildserver
+++ b/makebuildserver
@@ -243,8 +243,6 @@ cachefiles = [
      'cfc61eda71f2d12a572822644ce13d2919407595c2aec3e3566d2aab6f97ef39'),
     ('https://services.gradle.org/distributions/gradle-3.0-bin.zip',
      '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',
      '102d6723f67ff1384330d12c45854315d6452d6510286f4e5891e00a5a8f1d5a'),
     ('https://dl.google.com/android/ndk/android-ndk-r9b-linux-x86_64.tar.bz2',
-- 
2.30.2