Update ansible scripts

playbooks/roles/edxlocal/tasks/main.yml

@@ -112,6 +112,9 @@
 - name: Install build-essential for gcli
   apt: pkg=build-essential state=present
 
+- name: Install pkg-config
+  apt: pkg=pkg-config
+
 - name: Git clone ruby-build
   shell: git clone https://github.com/sstephenson/ruby-build.git ~/.rbenv/plugins/ruby-build
 
@@ -119,13 +122,17 @@
   shell: sh install.sh chdir=~/.rbenv/plugins/ruby-build/
 
 - name: Install ruby version
-  shell: rbenv install 1.9.3-p362
+  shell: rbenv install 1.9.3-p374
 
 - name: Set rbenv version
-  shell: rbenv global 1.9.3-p362
+  shell: rbenv global 1.9.3-p374
 
 - name: Install gcli
   shell: rbenv exec gem install github_cli
 
+
+- name: Install rake
+  apt: pkg=rake
+
 - name: TEMPORARILY DISABLE gcli
   shell: echo "#!/bin/bash\necho gcli" > /usr/local/bin/gcli

playbooks/roles/jenkins/tasks/jenkins.yml

 ---
 - name: Install Jenkins
-  apt: pkg=jenkins 
+  shell: wget -q -O - http://pkg.jenkins-ci.org/debian/jenkins-ci.org.key | sudo apt-key add -
+
+- name: Install Jenkins 2
+  shell: sh -c 'echo deb http://pkg.jenkins-ci.org/debian binary/ > /etc/apt/sources.list.d/jenkins.list'
+
+- name: Install Jenkins 3
+  shell: apt-get update
+
+- name: install jenkins 4
+  apt: pkg=jenkins state=present
+
+- name: Make plugins directory
+  shell: mkdir -p {{ jenkins_home }}/plugins
+
+- name: Mod plugins directory permissions
+  shell: chmod -R 777 {{ jenkins_home }}/plugins
 
 - name: Install Jenkins plugins
   get_url: url=http://updates.jenkins-ci.org/latest/${item}
-           dest={{ jenkins_home }}/plugins
+           dest={{ jenkins_home }}/plugins/${item}
   with_items:
     - ant.hpi
     - backup.hpi
@@ -15,15 +30,15 @@
     - 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
-    - jenkinswalldisplay.hpi
-    - jenkinswalldisplay-pom.hpi
     - jobConfigHistory.hpi
     - ldap.hpi
     - mailer.hpi
@@ -42,10 +57,46 @@
     - ssh-slaves.hpi
     - subversion.hpi
     - thinBackup.hpi
-    - timestamper.hpi
+    # - timestamper.hpi
     - tmpcleaner.hpi
     - token-macro.hpi
     - translation.hpi
     - violations.hpi
   notify:
     - restart Jenkins
+
+- name: Mod plugins directory permissions (Again)
+  shell: chmod -R 777 {{ jenkins_home }}/plugins
+
+- name: Restart Jenkins to allow for new plugins
+  shell: service jenkins restart
+
+- name: Make backup directory
+  shell: mkdir {{ jenkins_home }}/backup
+
+- name: Make backup directory
+  shell: chmod -R 777 {{ jenkins_home }}/backup
+
+- name: Chmod mnt
+  shell: chmod -R 777 /mnt/
+
+- name: Chmod /usr/local
+  shell: chmod -R 777 /usr/local/
+
+- name: chmod tmp
+  shell: chmod -R 777 /tmp/
+
+- name: Symbolic link site packages
+  shell: ln -s /usr/local/lib/python2.7/site-packages/ /usr/local/lib/python2.7/dist-packages/
+
+- name: install numpy
+  shell: pip install numpy==1.6.2
+
+- name: install scipy
+  shell: pip install scipy==0.11.0
+
+# - name: cmod lib directory for restore **Undo this after restore**
+#   shell: chmod -R 777 /var/lib
+
+# - name: Git clone
+#   action: git repo=https://github.com/lapentab/jenkinsconfig.git dest={{jenkins_home}}/backup

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

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

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

 # Set the display to the virtual frame buffer (Xvfb)
-export DISPLAY=:99
+export DISPLAY=:1
\ No newline at end of file