Merge pull request #912 from edx/feanil/build_ami_update

Update bash script to use shining panda correctly.

playbooks/roles/jenkins_admin/templates/edx/var/jenkins/jobs/build-ami/config.xml.j2

@@ -149,33 +149,30 @@
       <useDistribute>true</useDistribute>
       <systemSitePackages>false</systemSitePackages>
       <nature>shell</nature>
-      <command>#!/bin/bash -x
-if [[ &quot;\$play&quot; == &quot;&quot; ]]; then
-    echo &quot;No Play Specified. Nothing to Do.&quot;
-    exit 0
-fi
+      <command>
+#!/bin/bash -x
 
-if [ ! -d \$WORKSPACE/virtualenv ]; then
-    virtualenv --system-site-packages \$WORKSPACE/virtualenv
+if [[ "\$play" == "" ]]; then
+    echo "No Play Specified. Nothing to Do."
+    exit 0
 fi
 
 export PYTHONUNBUFFERED=1
 export PIP_DOWNLOAD_CACHE=\$WORKSPACE/pip-cache
 
-. \$WORKSPACE/virtualenv/bin/activate
-
 cd configuration
 pip install -r requirements.txt
 
 cd util/vpc-tools/
 
-echo &quot;\$refs&quot; &gt; /var/tmp/\$BUILD_ID-refs.yml
-cat /var/tmp/\$BUILD_ID-refs.yml
+echo "\$refs" > /var/tmp/$BUILD_ID-refs.yml
+cat /var/tmp/$BUILD_ID-refs.yml
 
-echo &quot;\$vars&quot; &gt; /var/tmp/\$BUILD_ID-extra-vars.yml
-cat /var/tmp/\$BUILD_ID-extra-vars.yml
+echo "\$vars" > /var/tmp/$BUILD_ID-extra-vars.yml
+cat /var/tmp/$BUILD_ID-extra-vars.yml
 
-python -u abbey.py -p \$play -t c1.medium  -d \$deployment -e \$environment -i {{jenkins_home}}/.ssh/id_rsa -b \$base_ami --vars /var/tmp/\$BUILD_ID-extra-vars.yml --refs /var/tmp/\$BUILD_ID-refs.yml -c \$BUILD_NUMBER --configuration-version \$configuration --configuration-secure-version \$configuration_secure -k {{JENKINS_ADMIN_EC2_KEY}} --configuration-secure-repo &quot;{{JENKINS_ADMIN_CONFIGURATION_SECURE_REPO}}&quot;</command>
+python -u abbey.py -p \$play -t c1.medium  -d \$deployment -e \$environment -i /edx/var/jenkins/.ssh/id_rsa -b \$base_ami --vars /var/tmp/\$BUILD_ID-extra-vars.yml --refs /var/tmp/\$BUILD_ID-refs.yml -c \$BUILD_NUMBER --configuration-version \$configuration --configuration-secure-version \$configuration_secure -k deployment --configuration-secure-repo "git@github.com:edx-ops/prod-secure.git"
+      </command>
       <ignoreExitCode>false</ignoreExitCode>
     </jenkins.plugins.shiningpanda.builders.VirtualenvBuilder>
     <hudson.tasks.Shell>