More fixes

Fixes #2166

acceptance_spec/acceptance/install_spec.rb

@@ -11,7 +11,7 @@ describe "Logstash class:" do
   when 'Debian'
     core_package_name    = 'logstash'
     service_name         = 'logstash'
-    core_url             = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/logstash/master/nightly/logstash-latest.deb'
+    core_url             = 'https://s3-eu-west-1.amazonaws.com/users.eu.elasticsearch.org/electrical/logstash_2.0.0.dev-1_all.deb'
     pid_file             = '/var/run/logstash.pid'
   end
 

acceptance_spec/acceptance/nodesets/debian-6-x64.yml

@@ -9,7 +9,7 @@ HOSTS:
     hypervisor: docker
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -yq lsb-release wget net-tools ruby rubygems ruby1.8-dev libaugeas-dev libaugeas-ruby ntpdate locales-all'
+      - 'apt-get install -yq lsb-release wget net-tools ruby rubygems ruby1.8-dev libaugeas-dev libaugeas-ruby ntpdate locales-all logrotate'
       - 'REALLY_GEM_UPDATE_SYSTEM=1 gem update --system --no-ri --no-rdoc'
 CONFIG:
   type: foss

acceptance_spec/acceptance/nodesets/debian-7-x64.yml

@@ -9,7 +9,7 @@ HOSTS:
     hypervisor: docker
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -yq lsb-release wget net-tools ruby rubygems ruby1.8-dev libaugeas-dev libaugeas-ruby ntpdate locales-all'
+      - 'apt-get install -yq lsb-release wget net-tools ruby rubygems ruby1.8-dev libaugeas-dev libaugeas-ruby ntpdate locales-all logrotate'
       - 'REALLY_GEM_UPDATE_SYSTEM=1 gem update --system --no-ri --no-rdoc'
 CONFIG:
   type: foss

acceptance_spec/acceptance/nodesets/ubuntu-server-1204-x64.yml

@@ -9,6 +9,6 @@ HOSTS:
     hypervisor: docker
     docker_cmd: '["/sbin/init"]'
     docker_image_commands:
-      - 'apt-get install -yq ruby1.8-dev libaugeas-dev libaugeas-ruby ruby rubygems lsb-release wget net-tools curl'
+      - 'apt-get install -yq ruby1.8-dev libaugeas-dev libaugeas-ruby ruby rubygems lsb-release wget net-tools curl logrotate'
 CONFIG:
   type: foss

acceptance_spec/acceptance/nodesets/ubuntu-server-1304-x64.yml

@@ -1,14 +0,0 @@
-HOSTS:
-  ubuntu-13-04:
-    roles:
-      - master
-      - database
-      - dashboard
-    platform: ubuntu-13.04-amd64
-    image: jordansissel/system:ubuntu-13.04
-    hypervisor: docker
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'apt-get install -yq ruby1.8-dev libaugeas-dev libaugeas-ruby ruby rubygems lsb-release wget net-tools curl'
-CONFIG:
-  type: foss

acceptance_spec/acceptance/nodesets/ubuntu-server-1404-x64.yml

@@ -0,0 +1,14 @@
+HOSTS:
+  ubuntu-14-04:
+    roles:
+      - master
+      - database
+      - dashboard
+    platform: ubuntu-14.04-amd64
+    image: electrical/ubuntu:14.04
+    hypervisor: docker
+    docker_cmd: '["/sbin/init"]'
+    docker_image_commands:
+      - 'apt-get install -yq ruby ruby1.9.1-dev libaugeas-dev libaugeas-ruby lsb-release wget net-tools curl'
+CONFIG:
+  type: foss

acceptance_spec/spec_helper_acceptance.rb

@@ -4,34 +4,59 @@ require 'securerandom'
 
 files_dir = ENV['files_dir'] || '/home/jenkins/puppet'
 
-proxy_host = ENV['proxy_host'] || ''
+proxy_host = ENV['BEAKER_PACKAGE_PROXY'] || ''
 
-gem_proxy = ''
-gem_proxy = "http_proxy=http://#{proxy_host}" unless proxy_host.empty?
+if !proxy_host.empty?
+  gem_proxy = "http_proxy=#{proxy_host}" unless proxy_host.empty?
+
+  hosts.each do |host|
+    on host, "echo 'export http_proxy='#{proxy_host}'' >> /root/.bashrc"
+    on host, "echo 'export https_proxy='#{proxy_host}'' >> /root/.bashrc"
+    on host, "echo 'export no_proxy=\"localhost,127.0.0.1,localaddress,.localdomain.com,#{host.name}\"' >> /root/.bashrc"
+  end
+else
+  gem_proxy = ''
+end
 
 hosts.each do |host|
   # Install Puppet
   if host.is_pe?
     install_pe
   else
-    puppetversion = ENV['VM_PUPPET_VERSION'] || '3.4.0'
-    install_package host, 'rubygems'
+    puppetversion = ENV['VM_PUPPET_VERSION']
     on host, "#{gem_proxy} gem install puppet --no-ri --no-rdoc --version '~> #{puppetversion}'"
     on host, "mkdir -p #{host['distmoduledir']}"
 
     if fact('osfamily') == 'Suse'
-      install_package host, 'ruby-devel augeas-devel libxml2-devel'
-      on host, 'gem install ruby-augeas --no-ri --no-rdoc'
+      install_package host, 'rubygems ruby-devel augeas-devel libxml2-devel'
+      on host, "#{gem_proxy} gem install ruby-augeas --no-ri --no-rdoc"
     end
 
   end
 
-  # Setup proxy if its enabled
-  if fact('osfamily') == 'Debian'
-          on host, "echo 'Acquire::http::Proxy \"http://#{proxy_host}/\";' >> /etc/apt/apt.conf.d/10proxy" unless proxy_host.empty?
+  case fact('osfamily')
+    when 'RedHat'
+      scp_to(host, "#{files_dir}/elasticsearch-1.3.1.noarch.rpm", '/tmp/elasticsearch-1.3.1.noarch.rpm')
+    when 'Debian'
+      case fact('lsbmajdistrelease')
+        when '6'
+          scp_to(host, "#{files_dir}/elasticsearch-1.1.0.deb", '/tmp/elasticsearch-1.1.0.deb')
+        else
+          scp_to(host, "#{files_dir}/elasticsearch-1.3.1.deb", '/tmp/elasticsearch-1.3.1.deb')
+      end
+    when 'Suse'
+      case fact('operatingsystem')
+        when 'OpenSuSE'
+          scp_to(host, "#{files_dir}/elasticsearch-1.1.0.noarch.rpm", '/tmp/elasticsearch-1.1.0.noarch.rpm')
+        else
+          scp_to(host, "#{files_dir}/elasticsearch-1.3.1.noarch.rpm", '/tmp/elasticsearch-1.3.1.noarch.rpm')
+      end
   end
-  if fact('osfamily') == 'RedHat'
-    on host, "echo 'proxy=http://#{proxy_host}/' >> /etc/yum.conf" unless proxy_host.empty?
+
+  # on debian/ubuntu nodes ensure we get the latest info
+  # Can happen we have stalled data in the images
+  if fact('osfamily') == 'Debian'
+    on host, "apt-get update"
   end
 
 end

tools/Gemfile.beaker

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gem 'beaker'
 gem 'beaker-rspec'
 gem 'pry'
-gem 'docker-api', '~> 1.13.0'
+gem 'docker-api'
 gem 'rubysl-securerandom'
 gem 'rspec_junit_formatter'
 gem 'rspec', '~> 2.14.0'