Merge pull request #3 from cyplo/dockerize_debian_tests

Dockerize tests for bunsen linux

.config/terminator/config

@@ -1,25 +1,9 @@
 [global_config]
-  window_state = maximise
   borderless = True
   focus = system
   title_transmit_bg_color = "#d30102"
+  window_state = maximise
 [keybindings]
-[profiles]
-  [[default]]
-    palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"
-    login_shell = True
-    background_image = None
-    background_darkness = 0.93
-    scrollback_lines = 8192
-    background_type = transparent
-    use_system_font = False
-    cursor_color = "#eee8d5"
-    foreground_color = "#eee8d5"
-    icon_bell = False
-    show_titlebar = False
-    font = DejaVu Sans Mono for Powerline 12
-    background_color = "#002b36"
-    scrollback_infinite = True
 [layouts]
   [[default]]
     [[[child1]]]
@@ -30,3 +14,19 @@
       parent = ""
       type = Window
 [plugins]
+[profiles]
+  [[default]]
+    background_color = "#002b36"
+    background_darkness = 0.93
+    background_image = None
+    background_type = transparent
+    cursor_color = "#eee8d5"
+    font = DejaVu Sans Mono for Powerline Bold 12
+    foreground_color = "#eee8d5"
+    icon_bell = False
+    login_shell = True
+    palette = "#073642:#dc322f:#859900:#b58900:#268bd2:#d33682:#2aa198:#eee8d5:#002b36:#cb4b16:#586e75:#657b83:#839496:#6c71c4:#93a1a1:#fdf6e3"
+    scrollback_infinite = True
+    scrollback_lines = 8192
+    show_titlebar = False
+    use_system_font = False

.travis.yml

@@ -1,4 +1,11 @@
 language: bash
-script: ./travis/configure_fresh_system
+
+script: ./bunsen/test_outsider 
+
+sudo: required
+
+services:
+      - docker
 git:
     submodules: false
+

bunsen/configure_fresh_system

@@ -1,13 +1,28 @@
 #!/bin/bash
+
+set -e
+set -v
+
 sudo apt-get update
 sudo apt-get -y upgrade
-sudo apt-get -y install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted wine solaar glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3
+install_packages="sudo apt-get -y --fix-missing install aptitude meld whois zsh tmux atop aria2 curl pv gajim tor torsocks nodejs icedove icedove-enigmail icedove-sogo-connector gajim lm-sensors freecad python3-pip meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial redshift gtk-redshift cmake intltool gparted wine solaar glances silversearcher-ag dkms linux-kernel-headers golang keepass2 libncurses5-dev libgnome2-dev libgnomeui-dev libgtk2.0-dev libatk1.0-dev libbonoboui2-dev libcairo2-dev libx11-dev libxpm-dev libxt-dev python-dev ruby-dev git retext kdiff3"
 
-sudo systemctl enable tor
+set +e
-sudo systemctl start tor
+for i in `seq 1 3`; do
+        eval $install_packages
+done
+
+set -e
+eval $install_packages
+
+if [[ -z $DONT_START_TOR ]]; then
+	sudo systemctl enable tor
+	sudo systemctl start tor
+fi
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 DIR="$DIR/../"
+DIR="$DIR" $DIR/common/configure_fresh_system
 
 # install vim from sources
 VIM_BUILD_DIR=/tmp
@@ -27,4 +42,3 @@ sudo make install
 cd
 rm -fvr "$VIM_BUILD_DIR/vim"
 
-DIR="$DIR" $DIR/common/configure_fresh_system

bunsen/test_insider

@@ -0,0 +1,19 @@
+#!/bin/bash
+
+set -e
+
+export DEBIAN_FRONTEND=noninteractive
+export DONT_CHANGE_SHELL=true
+export DONT_START_TOR=true
+
+echo "APT::Acquire::Retries=16;" >> /etc/apt/apt.conf.d/99_retries
+
+apt-get update
+apt-get install sudo
+cd $HOME
+
+mkdir -p dev/
+cp -rv temp/dotfiles dev/
+
+./dev/dotfiles/bunsen/configure_fresh_system
+

bunsen/test_outsider

@@ -0,0 +1,3 @@
+#!/bin/bash
+
+docker run -v `pwd`:/root/temp/dotfiles/ debian:jessie /root/temp/dotfiles/bunsen/test_insider

common/configure_fresh_system

@@ -1,6 +1,7 @@
 #!/bin/bash
 
 set -e
+set -v
 echo
 echo "configuring settings common among OSes"
 sudo true
@@ -98,7 +99,10 @@ cargo install racer
 # rvm
 gpg2 --keyserver hkp://keys.gnupg.net --recv-keys 409B6B1796C275462A1703113804BB82D39DC0E3
 $CURL -L https://get.rvm.io | bash -s stable
+set +e
+source /etc/profile.d/rvm.sh
 source $HOME/.rvm/scripts/rvm
+set -e
 rvm install ruby
 
 # go
@@ -116,6 +120,10 @@ sudo npm install -g diff-so-fancy
 echo "installing vdirsyncer"
 sudo pip install vdirsyncer
 
+if [[ -z $USER ]]; then
+    USER=`whoami`
+fi
+
 # normalize npm permissions
 mkdir -p $HOME/.npm
 sudo chown $USER $HOME/.npm -R

debian/install_debian.sh

@@ -1,8 +0,0 @@
-#!/bin/bash
-sudo apt-get update
-sudo apt-get dist-upgrade
-sudo apt-get install meld whois zsh tmux vim atop aria2 curl pv gajim tor torsocks nodejs
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-$DIR/install_common.sh
-

fedora/configure_fresh_system

@@ -2,11 +2,11 @@
 
 #software and shell
 sudo dnf -y upgrade --best --allowerasing
-sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel
+sudo dnf -y --best --allowerasing install vim tmux atop zsh thunderbird thunderbird-enigmail thunderbird-lightning firefox aria2 gajim lm_sensors freecad python3-pip qt5-qtbase-devel qt5-qtwebkit-devel meld whois curl pv tor torsocks nodejs npm terminator gsmartcontrol python-pip mercurial python-devel libxslt-devel libjpeg-turbo-devel conky conky-manager redshift redshift-gtk cmake gtk2-devel intltool gparted wine solaar glances the_silver_searcher dkms kernel-devel gimp transmission-gtk
 FEDORA_VERSION=`rpm -E %fedora`
 sudo dnf -y install http://download1.rpmfusion.org/free/fedora/rpmfusion-free-release-$FEDORA_VERSION.noarch.rpm
 sudo dnf -y install http://download1.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$FEDORA_VERSION.noarch.rpm
-sudo dnf -y install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang
+sudo dnf -y --best --allowerasing install vlc splix gutenprint-cups cups-bjnp keepass mplayer golang
 sudo dnf -y groupinstall "C Development Tools and Libraries"
 
 sudo systemctl enable tor