Merge pull request #261 from travis-ci/mm-cleanup-cruft

Cleanup cruft that accumulates during provisioning
travis-ci · Jan 23, 2014 · 20f26bf · 20f26bf
2 parents 6059cd8 + 6266b7d
commit 20f26bf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/ci_environment/java/recipes/oraclejdk7.rb b/ci_environment/java/recipes/oraclejdk7.rb
@@ -33,3 +33,8 @@
 if node.java.oraclejdk7.install_jce_unlimited
   execute "curl -L --cookie 'ARU_LANG=US; s_cc=true; gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjce-6-download-429243.html; s_sq=oracleotnlive%2Coracleglobal%3D%2526pid%253Dotn%25253Aen-us%25253A%25252Fjava%25252Fjavase%25252Fdownloads%25252Fjce-6-download-429243.html%2526pidt%253D1%2526oid%253Dhttp%25253A%25252F%25252Fwww.oracle.com%25252Ftechnetwork%25252Fjava%25252Fjavase%25252Fdownloads%25252Fjce-6-download-429243.html%2526ot%253DA'  http://download.oracle.com/otn-pub/java/jce/7/UnlimitedJCEPolicyJDK7.zip -o /tmp/policy.zip && sudo unzip -j -o /tmp/policy.zip *.jar -d #{oraclejdk7_home}/jre/lib/security && rm /tmp/policy.zip"
 end
+
+directory '/var/cache/oracle-jdk7-installer' do
+  action :delete
+  ignore_failure true
+end
diff --git a/ci_environment/java/recipes/oraclejdk8.rb b/ci_environment/java/recipes/oraclejdk8.rb
@@ -31,6 +31,11 @@
   to '/etc/ssl/certs/java/cacerts'
 end
 
+directory '/var/cache/oracle-jdk8-installer' do
+  action :delete
+  ignore_failure true
+end
+
 # Note about JCE unlimited: There is currently no JCE Unlimited Strength package for JDK8, as it still in 'Developer Preview' phase.
 # Projects interested in Java8-EA integrate should thus be aware of this current limitation...
 #