Merge pull request #1333 from electrical/package_acceptance_fix

Fix beaker node files due to variable name change

acceptance_spec/acceptance/install_spec.rb

@@ -4,21 +4,25 @@ describe "Logstash class:" do
 
   case fact('osfamily')
   when 'RedHat'
-    package_name = 'logstash'
-    service_name = 'logstash'
-    url          = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/origin/master/nightly/JDK7/logstash-latest.rpm'
-    pid_file     = '/var/run/logstash.pid'
+    core_package_name    = 'logstash'
+    contrib_package_name = 'logstash-contrib'
+    service_name         = 'logstash'
+    core_url             = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/logstash/master/nightly/logstash-latest.rpm'
+    contrib_url          = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/logstash/master/nightly/logstash-contrib-latest.rpm'
+    pid_file             = '/var/run/logstash.pid'
   when 'Debian'
-    package_name = 'logstash'
-    service_name = 'logstash'
-    url          = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/origin/master/nightly/JDK7/logstash-latest.deb'
-    pid_file     = '/var/run/logstash.pid'
+    core_package_name    = 'logstash'
+    contrib_package_name = 'logstash-contrib'
+    service_name         = 'logstash'
+    core_url             = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/logstash/master/nightly/logstash-latest.deb'
+    contrib_url          = 'https://s3-us-west-2.amazonaws.com/build.elasticsearch.org/logstash/master/nightly/logstash-contrib-latest.deb'
+    pid_file             = '/var/run/logstash.pid'
   end
 
-  context "Install Nightly build package" do
+  context "Install Nightly core package" do
 
     it 'should run successfully' do
-      pp = "class { 'logstash': package_url => '#{url}', java_install => true }
+      pp = "class { 'logstash': package_url => '#{core_url}', java_install => true }
             logstash::configfile { 'basic_config': content => 'input { tcp { port => 2000 } } output { stdout { } } ' }
            "
 
@@ -29,7 +33,84 @@ describe "Logstash class:" do
 
     end
 
-    describe package(package_name) do
+    describe package(core_package_name) do
+      it { should be_installed }
+    end
+
+    describe service(service_name) do
+      it { should be_enabled }
+      it { should be_running }
+    end
+
+    describe file(pid_file) do
+      it { should be_file }
+      its(:content) { should match /[0-9]+/ }
+    end
+
+    describe port(2000) do
+      it {
+        sleep 30
+        should be_listening
+      }
+    end
+
+  end
+
+  context "ensure we are still running" do
+
+    describe service(service_name) do
+      it {
+        sleep 30
+        should be_running
+      }
+    end
+
+    describe port(2000) do
+      it { should be_listening }
+    end
+
+  end
+
+  describe "module removal" do
+
+    it 'should run successfully' do
+      pp = "class { 'logstash': ensure => 'absent' }"
+
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+
+    end
+
+    describe service(service_name) do
+      it { should_not be_enabled }
+      it { should_not be_running }
+    end
+
+    describe package(core_package_name) do
+      it { should_not be_installed }
+    end
+
+  end
+
+  context "Install Nightly core + contrib packages" do
+
+    it 'should run successfully' do
+      pp = "class { 'logstash': package_url => '#{core_url}', java_install => true, contrib_package_url => '#{contrib_url}', install_contrib => true }
+            logstash::configfile { 'basic_config': content => 'input { tcp { port => 2000 } } output { stdout { } } ' }
+           "
+
+      # Run it twice and test for idempotency
+      apply_manifest(pp, :catch_failures => true)
+      sleep 20
+      expect(apply_manifest(pp, :catch_failures => true).exit_code).to be_zero
+
+    end
+
+    describe package(core_package_name) do
+      it { should be_installed }
+    end
+
+    describe package(contrib_package_name) do
       it { should be_installed }
     end
 
@@ -68,3 +149,4 @@ describe "Logstash class:" do
   end
 
 end
+

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

@@ -8,7 +8,7 @@ HOSTS:
     image: jordansissel/system:centos-6.4
     hypervisor: docker
     docker_cmd: '["/sbin/init"]'
-    extra_commands:
+    docker_image_commands:
       - 'yum install -y wget ntpdate rubygems ruby-augeas ruby-devel augeas-devel'
       - 'touch /etc/sysconfig/network'
 CONFIG:

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

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

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

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

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

@@ -8,7 +8,7 @@ HOSTS:
     image: jordansissel/system:ubuntu-12.04
     hypervisor: docker
     docker_cmd: '["/sbin/init"]'
-    extra_commands:
+    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-1304-x64.yml

@@ -8,7 +8,7 @@ HOSTS:
     image: jordansissel/system:ubuntu-13.04
     hypervisor: docker
     docker_cmd: '["/sbin/init"]'
-    extra_commands:
+    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