WIPland

util/packer/jenkins_worker.json

@@ -54,19 +54,21 @@
   }, {
     "type": "shell",
     "inline": ["cd {{user `playbook_remote_dir`}}",
+      "rm -rf packer-venv",
       "virtualenv packer-venv",
       ". packer-venv/bin/activate",
-      "pip install -r requirements.txt",
+      "pip install -q -r requirements.txt",
       "echo '[jenkins_worker]' > inventory.ini",
       "echo 'localhost' >> inventory.ini",
-      "ansible-playbook edx-east/jenkins_worker.yml -i inventory.ini -c local -vvvv"]
+      "ansible-playbook run_role.yml -i inventory.ini -c local --extra-vars='{\"role\": \"test_build_server\", \"test_platform_version\": \"{{user `test_platform_version`}}\"}' -vvvv"]
   }, {
     "type": "shell",
     "inline": ["cd {{user `playbook_remote_dir`}}",
-      "rm -rf packer-venv",
       "virtualenv packer-venv",
       ". packer-venv/bin/activate",
-      "pip install -q -r requirements.txt",
-      "ansible-playbook run_role.yml -i inventory.ini -c local --extra-vars='role=test_build_server,test_platform_version={{user `test_platform_version`}}' -vvvv"]
+      "pip install -r requirements.txt",
+      "echo '[jenkins_worker]' > inventory.ini",
+      "echo 'localhost' >> inventory.ini",
+      "ansible-playbook edx-east/jenkins_worker.yml -i inventory.ini -c local -vvvv"]
   }]
 }