Fix ansible scripts

playbooks/roles/edxlocal/tasks/main.yml

@@ -70,59 +70,18 @@
     password=password
     state=present
 
-- name: edxlocal | install memcached
-  apt: pkg=memcached state=present
-
-- name: Install Ruby-bundler
-  apt: pkg=ruby-bundler
-
-- name: Install rubygems
-  apt: pkg=rubygems
-
-- name: install rbenv
-  apt: pkg=rbenv state=present
-
-- name: Install npm
-  apt: pkg=npm
-
-- name: install libgraphviz-dev
-  apt: pkg=libgraphviz-dev
-
-- name: install gfortran
-  apt: pkg=gfortran
-
-- name: install libopenblas-dev
-  apt: pkg=libopenblas-dev
-
-- name: install liblapack-dev
-  apt: pkg=liblapack-dev
-
-- name: install libxml2-dev
-  apt: pkg=libxml2-dev
-
-- name: Install libgeos
-  apt: pkg=libgeos-dev
-
-- name: Install python-dev
-  apt: pkg=python-dev
-
-- name: Install libmysqlclient-dev
-  apt: pkg=libmysqlclient-dev
-
-- name: Install build-essential for gcli
-  apt: pkg=build-essential state=present
-
-- name: Install pkg-config
-  apt: pkg=pkg-config
+- name: edxlocal | install edxlocal specific system packages
+  apt: pkg={{','.join(edxlocal_debian_pkgs)}} state=present
 
 - name: Git clone ruby-build
-  shell: git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
+  shell: git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build creates=~/.rbenv/plugins/ruby-build
 
 - name: install ruby-build
   shell: sh install.sh chdir=~/.rbenv/plugins/ruby-build/
 
 - name: Install ruby version
-  shell: rbenv install 1.9.3-p374
+  shell: yes n|rbenv install 1.9.3-p374
+  ignore_errors: yes
 
 - name: Set rbenv version
   shell: rbenv global 1.9.3-p374
@@ -130,11 +89,6 @@
 - name: Install gcli
   shell: rbenv exec gem install github_cli
 
-- name: install libxslt-dev
-  apt: pkg=libxslt-dev
-
-- name: Install rake
-  apt: pkg=rake
-
+# This is done so that it will not report back to github while testing
 - name: TEMPORARILY DISABLE gcli
   shell: echo "#!/bin/bash\necho gcli" > /usr/local/bin/gcli

playbooks/roles/jenkins/tasks/browsers.yml

@@ -15,47 +15,32 @@
            creates=/usr/local/bin/phantomjs
 
 - name: Set PhantomJS permissions
-  command: chmod go+rx /usr/local/bin/phantomjs
+  file: path=/usr/local/bin/phantomjs mode=0755 state=directory
 
 - name: Install chrome dependencies
-  apt: pkg=libgconf2-4
-
-- name: Install chrome dependencies 2
-  apt: pkg=libxss1
-
-- name: Install chrome dependencies 3
-  apt: pkg=libnss3-1d
-
-- name: Install chrome dependencies 4
-  apt: pkg=libcurl3
-
-- name: Install chrome dependencies 5
-  apt: pkg=xdg-utils
+  apt: pkg=libgconf2-4,libxss1,libnss3-1d,libcurl3,xdg-utils
 
 - name: Install unzip O_o
   apt: pkg=unzip
 
 - name: Install Google Chrome
-  command: wget https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb
-           chdir=/var/tmp
+  get_url: url=https://dl.google.com/linux/direct/google-chrome-stable_current_amd64.deb dest=/var/tmp/google-chrome-stable_current_amd64.deb
 
 - name: Install Google Chrome 2
   command: dpkg -i google-chrome-stable_current_amd64.deb
            chdir=/var/tmp
   ignore_errors: True
 
-- name: Install Google Chrome 3
-  command: apt-get -f -y install
-
 - name: Install ChromeDriver
-  shell: wget --quiet https://chromedriver.googlecode.com/files/chromedriver_linux64_2.1.zip
+  get_url: url=https://chromedriver.googlecode.com/files/chromedriver_linux64_2.1.zip dest=/var/tmp/chromedriver_linux64_2.1.zip
 
 - name: Install ChromeDriver 2
-  shell: unzip chromedriver_linux64_2.1.zip
+  shell: unzip /var/tmp/chromedriver_linux64_2.1.zip
+         chdir=/var/tmp
 
 - name: Install ChromeDriver 3
-  shell: mv chromedriver /usr/local/bin/chromedriver
+  shell: mv /var/tmp/chromedriver /usr/local/bin/chromedriver
 
 - name: Install Chromedriver 4
-  shell: chmod go+rx /usr/local/bin/chromedriver
+  file: path=/usr/local/bin/chromedriver mode=0755
 

playbooks/roles/jenkins/tasks/jenkins.yml

@@ -18,51 +18,27 @@
   sudo_user: jenkins
   shell: mkdir -p {{ jenkins_home }}/plugins
 
+- name: Make virtualenv directory
+  shell: mkdir -p /mnt/virtualenvs
+
+- name: Chown virtualenv directory
+  file: path=/mnt/virtualenvs/ state=directory owner=jenkins recurse=yes
+
+- name: Make pip-cache directory
+  shell: mkdir -p /mnt/pip-cache
+
+- name: Chown pip-cache directory
+  file: path=/mnt/pip-cache/ state=directory owner=jenkins recurse=yes
+
+- name: Allow /usr/local/bin to be executable
+  shell: chmod -R go+x /usr/local/bin
+
 - name: Install Jenkins plugins
   sudo_user: jenkins
   get_url: url=http://updates.jenkins-ci.org/latest/${item}
            dest={{ jenkins_home }}/plugins/${item}
-  with_items:
-    - ant.hpi
-    - backup.hpi
-    - build-name-setter.hpi
-    - build-timeout.hpi
-    - cobertura.hpi
-    - credentials.hpi
-    - cvs.hpi
-    - dashboard-view.hpi
-    - external-monitor-job.hpi
-    - ghprb.hpi
-    - git.hpi
-    - github.hpi
-    - git-client.hpi
-    - github-api.hpi
-    - github-oauth.hpi
-    - git-notes.hpi
-    - htmlpublisher.hpi
-    - javadoc.hpi
-    - jobConfigHistory.hpi
-    - ldap.hpi
-    - mailer.hpi
-    # - maven-plugin.hpi
-    - mercurial.hpi
-    - nested-view.hpi
-    - next-build-number.hpi
-    - notification.hpi
-    - pam-auth.hpi
-    - parameterized-trigger.hpi
-    - postbuild-task.hpi
-    - rbenv.hpi
-    - ruby-runtime.hpi
-    - shiningpanda.hpi
-    - ssh-credentials.hpi
-    - ssh-slaves.hpi
-    - subversion.hpi
-    - thinBackup.hpi
-    # - timestamper.hpi
-    - tmpcleaner.hpi
-    - token-macro.hpi
-    - translation.hpi
-    - violations.hpi
+  with_items: "{{ jenkins_plugins }}"
+    #- timestamper.hpi
+    #- maven-plugin.hpi
   notify:
     - restart Jenkins

playbooks/roles/jenkins/tasks/main.yml

 ---
 - include: jenkins.yml
-- include: config-backup.yml
 - include: xvfb.yml
 - include: browsers.yml
 - include: python-pkgs.yml

playbooks/roles/jenkins/tasks/python-pkgs.yml

 ---
 - name: Symbolic link site packages
-  shell: ln -s -f /usr/local/lib/python2.7/site-packages/ /usr/local/lib/python2.7/dist-packages/
+  file: src=/usr/local/lib/python2.7/site-packages dest=/usr/local/lib/python2.7/dist-packages state=link
+  ignore_errors: yes
 
 - name: install numpy
   shell: pip install numpy==1.6.2

playbooks/roles/jenkins/tasks/xvfb.yml

@@ -7,5 +7,7 @@
 
 - name: create xvfb upstart script
   template: src=xvfb.conf.j2 dest=/etc/init/xvfb.conf owner=root group=root
-  notify:
-    - start xvfb
+
+- name: start xvfb
+  shell: start xvfb
+  ignore_errors: yes
\ No newline at end of file

playbooks/roles/jenkins/templates/xvfb.conf.j2

@@ -4,3 +4,5 @@ start on (net-device-up
           and runlevel [2345])
 stop on runlevel [016]
 exec /usr/bin/Xvfb :1 -screen 0 1024x768x24
+respawn
+respawn limit 15 5
\ No newline at end of file

playbooks/roles/jenkins/vars/main.yml

@@ -3,3 +3,44 @@ jenkins_home: /var/lib/jenkins
 phantomjs_url: https://phantomjs.googlecode.com/files/phantomjs-1.9.1-linux-x86_64.tar.bz2
 phantomjs_archive: phantomjs-1.9.1-linux-x86_64.tar.bz2
 phantomjs_folder: phantomjs-1.9.1-linux-x86_64
+edxlocal_debian_pkgs: ["memcached", "ruby-bundler","rubygems","rbenv","npm","libgraphviz-dev","gfortran","libopenblas-dev","liblapack-dev","libxml2-dev","libgeos-dev","python-dev","libmysqlclient-dev","build-essential","pkg-config","libxslt1-dev","rake"]
+jenkins_plugins:
+    - ant.hpi
+    - backup.hpi
+    - build-name-setter.hpi
+    - build-timeout.hpi
+    - cobertura.hpi
+    - credentials.hpi
+    - cvs.hpi
+    - dashboard-view.hpi
+    - external-monitor-job.hpi
+    - ghprb.hpi
+    - git.hpi
+    - github.hpi
+    - git-client.hpi
+    - github-api.hpi
+    - github-oauth.hpi
+    - git-notes.hpi
+    - htmlpublisher.hpi
+    - javadoc.hpi
+    - jobConfigHistory.hpi
+    - ldap.hpi
+    - mailer.hpi
+    - mercurial.hpi
+    - nested-view.hpi
+    - next-build-number.hpi
+    - notification.hpi
+    - pam-auth.hpi
+    - parameterized-trigger.hpi
+    - postbuild-task.hpi
+    - rbenv.hpi
+    - ruby-runtime.hpi
+    - shiningpanda.hpi
+    - ssh-credentials.hpi
+    - ssh-slaves.hpi
+    - subversion.hpi
+    - thinBackup.hpi
+    - tmpcleaner.hpi
+    - token-macro.hpi
+    - translation.hpi
+    - violations.hpi
\ No newline at end of file