Merge pull request #2767 from edx/benp/remove-ruby-jenkins-worker

Benp/remove ruby jenkins worker

playbooks/roles/jenkins_worker/defaults/main.yml

@@ -6,15 +6,13 @@ jenkins_home: /home/jenkins
 # repo for nodejs
 jenkins_chrislea_ppa: "ppa:chris-lea/node.js"
 
+jenkins_edx_platform_version: master
+
 # System packages
 jenkins_debian_pkgs:
     - nodejs
     - pkg-config
 
-# Ruby Specific Vars
-jenkins_rbenv_root: "{{ jenkins_home }}/.rbenv"
-jenkins_ruby_version: "1.9.3-p374"
-
 # packer direct download URL
 packer_url: "https://releases.hashicorp.com/packer/0.8.6/packer_0.8.6_linux_amd64.zip"
 

playbooks/roles/jenkins_worker/meta/main.yml

@@ -11,12 +11,6 @@ dependencies:
   # dependencies for edx-app jenkins worker:
   - role: edxapp_common
     when: platform_worker is defined
-  - role: rbenv
-    rbenv_user: "{{ jenkins_user }}"
-    rbenv_dir: "{{ jenkins_home }}"
-    rbenv_ruby_version: "{{ jenkins_ruby_version }}"
-    jenkins_worker: true
-    when: platform_worker is defined
 
   # dependencies for sitespeed worker
   - role: sitespeedio

playbooks/roles/jenkins_worker/tasks/main.yml

@@ -11,8 +11,6 @@
 - include: python.yml
 
 # only platform workers
-- include: ruby.yml
-  when: platform_worker is defined
 - include: python_platform_worker.yml
   when: platform_worker is defined
 

playbooks/roles/jenkins_worker/tasks/python_platform_worker.yml

@@ -9,7 +9,7 @@
   git: >
     repo=https://github.com/edx/edx-platform.git
     dest={{ jenkins_home }}/shallow-clone
-    version=master
+    version={{ jenkins_edx_platform_version }}
     depth=1
   sudo_user: "{{ jenkins_user }}"
 

playbooks/roles/jenkins_worker/tasks/ruby.yml

----
-
-# Archive the current state of the rbenv
-# as a starting point for new builds.
-# The edx-rbenv directory is deleted and then recreated
-# cleanly from the archive by the jenkins build scripts.
-- name: Create a clean rbenv archive
-  command: >
-    tar -cpzf edx-rbenv_clean.tar.gz .rbenv
-    chdir={{ jenkins_home }}
-    creates={{ jenkins_home }}/edx-rbenv_clean.tar.gz
-  sudo_user: "{{ jenkins_user }}"

playbooks/roles/jenkins_worker/templates/jenkins_env.j2

-# Configure Ruby
-export GEM_ROOT="{{ jenkins_home }}/.gem"
-export GEM_HOME="{{ jenkins_home }}/.gem"
-export PATH="{{ jenkins_rbenv_root }}/bin:{{jenkins_rbenv_root }}/shims:{{ jenkins_home }}/.gem/bin:$PATH"
-export RBENV_ROOT="{{ jenkins_rbenv_root }}"
-
 # Configure JavaScript coverage
 export JSCOVER_JAR=/usr/local/bin/JSCover-all-{{ jscover_version }}.jar
 

util/packer/jenkins_worker.json

@@ -68,6 +68,7 @@
     "command": "source {{user `playbook_remote_dir`}}/packer-venv/bin/activate && ansible-playbook",
     "inventory_groups": "jenkins_worker",
     "extra_arguments": [
+      "-e \"jenkins_edx_platform_version={{user `test_platform_version`}}\"",
       "-vvv"
       ]
   }, {