Added more code to get jhbuild installed properly and set the apt cache a bit higher. Still needs work

5 files changed, 45 insertions, 34 deletions

diff --git a/ansible/playbooks/install_jhbuild_deps.yaml b/ansible/playbooks/install_jhbuild_deps.yaml
new file mode 100644
index 0000000..2c5dbe5
--- /dev/null
+++ b/ansible/playbooks/install_jhbuild_deps.yaml
@@ -0,0 +1,19 @@
+---
+# vim:ff=unix ts=2 sw=2 ai expandtab
+-
+  hosts: dev_machine
+
+  sudo: True
+
+  vars_files:
+    - "../default_variables.yaml"
+
+  tasks:
+    - name: "Creating /opt/gnome directory"
+      file: path=/opt/gnome state=directory mode=777
+
+    - name: "Updating apt-file cache"
+      shell: apt-file update
+
+    - name: "Installing dependencies"
+      shell: jhbuild sysdeps --install
diff --git a/ansible/playbooks/setup_dev_machine_user.yaml b/ansible/playbooks/setup_dev_machine_user.yaml
deleted file mode 100644
index 3ffe699..0000000
--- a/ansible/playbooks/setup_dev_machine_user.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
----
-# vim:ff=unix ts=2 sw=2 ai expandtab
-
-###
-# Notice the minus on the line below -- this starts the playbook's record
-# in the YAML document. Only one playbook is allowed per YAML file.  Indent
-# the body of the playbook.
--
-  hosts: dev_machine
-
-  sudo: False
-
-  vars_files:
-    - "../default_variables.yaml"
-
-  tasks:
-    - include: setup_jhbuild.yaml
diff --git a/ansible/playbooks/setup_jhbuild.yaml b/ansible/playbooks/setup_jhbuild.yaml
index fdbb0c0..dfdee4b 100644
--- a/ansible/playbooks/setup_jhbuild.yaml
+++ b/ansible/playbooks/setup_jhbuild.yaml
@@ -1,24 +1,32 @@
 ---
 # vim:ff=unix ts=2 sw=2 ai expandtab
+-
+  hosts: dev_machine
 
-- name: "Ensuring that git is installed"
-  apt: name=git
+  sudo: False
 
-- name: "Creating checkout directory"
-  file: path=~/checkout state=directory mode=755
+  vars_files:
+    - "../default_variables.yaml"
 
-- name: "Cloning jhbuild"
-  git: repo=git://git.gnome.org/jhbuild
-       dest=~/checkout/jhbuild
+  tasks:
+    - name: "Ensuring that git is installed"
+      apt: name=git update_cache=true cache_valid_time=259200
 
-- name: "Installing jhbuild - autogen"
-  shell: cd ~/checkout/jhbuild && ./autogen.sh
+    - name: "Creating checkout directory"
+      file: path=~/checkout state=directory mode=755
 
-- name: "Installing jhbuild - make"
-  shell: cd ~/checkout/jhbuild && make 
+    - name: "Cloning jhbuild"
+      git: repo=git://git.gnome.org/jhbuild
+           dest=~/checkout/jhbuild
 
-- name: "Installing jhbuild - make install"
-  shell: cd ~/checkout/jhbuild && make install
+    - name: "Installing jhbuild - autogen"
+      shell: cd ~/checkout/jhbuild && ./autogen.sh
 
-- name: "Creating glib schemas dir"
-  file: path=~/install/share/glib-2.0/schemas state=directory mode=755
+    - name: "Installing jhbuild - make"
+      shell: cd ~/checkout/jhbuild && make 
+
+    - name: "Installing jhbuild - make install"
+      shell: cd ~/checkout/jhbuild && make install
+
+    - name: "Creating glib schemas dir"
+      file: path=~/install/share/glib-2.0/schemas state=directory mode=755
diff --git a/ansible/playbooks/setup_other_tools.yaml b/ansible/playbooks/setup_other_tools.yaml
index ef7eec6..126a68b 100644
--- a/ansible/playbooks/setup_other_tools.yaml
+++ b/ansible/playbooks/setup_other_tools.yaml
@@ -2,7 +2,7 @@
 # vim:ff=unix ts=2 sw=2 ai expandtab
 
 - name: "Ensuring that git is installed"
-  apt: name=git
+  apt: name=git update_cache=true cache_valid_time=259200
 
 - name: "Creating turbine directory"
   file: path=~/checkout state=directory mode=755
diff --git a/ansible/setup_dev_machine.sh b/ansible/setup_dev_machine.sh
index dc20084..292bf00 100755
--- a/ansible/setup_dev_machine.sh
+++ b/ansible/setup_dev_machine.sh
@@ -38,4 +38,5 @@ dev_machine ansible_ssh_host=$TARGET_IP ansible_ssh_user="$TARGET_USER" ansible_
 EOF
 
 ansible-playbook -i $tmp_inventory playbooks/setup_dev_machine_root.yaml
-ansible-playbook -i $tmp_inventory playbooks/setup_dev_machine_user.yaml
+ansible-playbook -i $tmp_inventory playbooks/setup_jhbuild.yaml
+ansible-playbook -i $tmp_inventory playbooks/install_jhbuild_deps.yaml