Merge pull request #2652 from edx/benp/jenkins-simple-update

Hygienic update of jenkins_worker_simple packer file.

util/packer/jenkins_worker_simple.json

@@ -3,7 +3,8 @@
     "aws_access_key": "{{env `AWS_ACCESS_KEY_ID`}}",
     "aws_secret_key": "{{env `AWS_SECRET_ACCESS_KEY`}}",
     "playbook_remote_dir": "/tmp/packer-edx-playbooks",
-    "ami": "{{env `JENKINS_WORKER_AMI`}}"
+    "ami": "{{env `JENKINS_WORKER_AMI`}}",
+    "test_platform_version": "{{env `TEST_PLATFORM_VERSION`}}"
   },
   "builders": [{
     "type": "amazon-ebs",
@@ -49,12 +50,21 @@
     "inline": ["sudo apt-get -y install git-core"]
   }, {
     "type": "shell",
+    "inline": ["sudo apt-get -y install libmysqlclient-dev"]
+  }, {
+    "type": "shell",
     "inline": ["cd {{user `playbook_remote_dir`}}",
       "virtualenv packer-venv",
       ". packer-venv/bin/activate",
-      "pip install -q -r requirements.txt",
-      "echo '[jenkins_worker]' > inventory.ini",
-      "echo 'localhost' >> inventory.ini",
-      "ansible-playbook run_role.yml -i inventory.ini -c local -e role=jenkins_worker -vvvv"]
+      "pip install -q -r requirements.txt"]
+  }, {
+    "type": "ansible-local",
+    "playbook_file": "../../playbooks/edx-east/jenkins_worker.yml",
+    "playbook_dir": "../../playbooks",
+    "command": "source {{user `playbook_remote_dir`}}/packer-venv/bin/activate && ansible-playbook",
+    "inventory_groups": "jenkins_worker",
+    "extra_arguments": [
+      "-vvv"
+      ]
   }]
 }