Merge pull request #842 from travis-ci/emma-precise-fixes

Fixes for Precise images

Author: emdantrim

ci_environment/bison/attributes/default.rb

@@ -1,5 +1,5 @@
 arch     = kernel['machine'] =~ /x86_64/ ? "amd64" : "i386"
-filename = "bison_3.0.4.dfsg-1_#{arch}.deb"
+filename = "bison_3.0.4.dfsg-1+b1_#{arch}.deb"
 
 default[:bison] = {
   :filename => filename,

ci_environment/bison/recipes/default.rb

@@ -25,24 +25,24 @@
 tmp = Dir.tmpdir
 case node[:platform]
 when "debian", "ubuntu"
-  path = File.join(tmp, node.bison.filename)
+   path = File.join(tmp, node.bison.filename)
 
-  remote_file(path) do
-    source node.bison.url
+   remote_file(path) do
+   source node.bison.url
 
-    owner node.travis_build_environment.user
-    group node.travis_build_environment.group
-  end
+     owner node.travis_build_environment.user
+     group node.travis_build_environment.group
+   end
 
-  file(path) do
-    action :nothing
-  end
+   file(path) do
+     action :nothing
+   end
 
-  package(path) do
-    action   :install
-    source   path
-    provider Chef::Provider::Package::Dpkg
+   package(path) do
+     action   :install
+     source   path
+     provider Chef::Provider::Package::Dpkg
 
-    notifies :delete, resources(:file => path)
-  end
+     notifies :delete, resources(:file => path)
+   end
 end # case

ci_environment/git/recipes/ppa.rb

@@ -24,7 +24,7 @@
   uri          "http://ppa.launchpad.net/git-core/v1.8/ubuntu"
   distribution node['lsb']['codename']
   components   ["main"]
-  key          "E1DF1F24"
+  key          "0xE1DF1F24"
   keyserver    "hkp://ha.pool.sks-keyservers.net"
 
   action :add

ci_environment/hhvm/recipes/package.rb

@@ -18,6 +18,6 @@
 
 package node["hhvm"]["package"]["name"] do
   action  :install
-  options "--force-yes"
+  options "--allow-change-held-packages --allow-downgrades"
   not_if { node['hhvm']['package']['disabled'] }
 end

ci_environment/php/metadata.rb

@@ -18,5 +18,3 @@
 depends "composer"
 depends "phpbuild"
 depends "phpenv"
-
-depends "hhvm"

ci_environment/php/recipes/hhvm-nightly.rb

@@ -58,8 +58,6 @@
 end
 
 include_recipe "php::extensions"
-include_recipe "php::hhvm"
-include_recipe "php::hhvm-nightly"
 include_recipe "phpunit"
 include_recipe "composer"
 

ci_environment/php/recipes/hhvm.rb

@@ -3,4 +3,4 @@
 license          "Apache v2.0"
 description      "Installs/Configures redis"
 
-recipe           "redis::default",       "Installs Redis Server from ppa:rwky/redis"
+recipe           "redis::default",       "Installs Redis Server from ppa:chrislea/redis-server"

ci_environment/php/recipes/multi.rb

@@ -21,13 +21,12 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 # THE SOFTWARE.
 
-apt_repository "rwky-redis" do
-  uri          "http://ppa.launchpad.net/rwky/redis/ubuntu"
+apt_repository "chris-lea-redis-server" do
+  uri          "http://ppa.launchpad.net/chris-lea/redis-server/ubuntu"
   distribution node['lsb']['codename']
   components   ["main"]
-  key          "5862E31D"
+  key          "0xC7917B12"
   keyserver    "hkp://ha.pool.sks-keyservers.net"
-
   action :add
 end
 
@@ -36,7 +35,7 @@
 end
 
 service "redis-server" do
-  provider Chef::Provider::Service::Upstart
+  provider Chef::Provider::Service::Init::Debian
   supports :restart => true, :status => true, :reload => true
   if node.redis.service.enabled
     action [:enable, :start]