(FM-8223) converted to use litmus

spec/acceptance/install_spec.rb

@@ -1,7 +1,5 @@
 require 'spec_helper_acceptance'
 
-include Unix::File
-
 java_class_jre = "class { 'java':\n"\
                  "  distribution => 'jre',\n"\
                  '}'
@@ -22,14 +20,6 @@ _sun_jdk = "class { 'java':\n"\
           "  distribution => 'sun-jdk',\n"\
           '}'
 
-oracle_jre = "class { 'java':\n"\
-             "  distribution => 'oracle-jre',\n"\
-             '}'
-
-oracle_jdk = "class { 'java':\n"\
-             "  distribution => 'oracle-jdk',\n"\
-             '}'
-
 blank_version = "class { 'java':\n"\
                 "  version => '',\n"\
                 '}'
@@ -51,88 +41,15 @@ bogus_alternative = "class { 'java':\n"\
                     "  java_alternative_path => '/whatever',\n"\
                     '}'
 
-# Oracle installs are disabled by default, because the links to valid oracle installations
-# change often. Look the parameters up from the Oracle download URLs at https://java.oracle.com and
-# enable the tests:
-
-oracle_enabled = false
-oracle_version_major = '8'
-oracle_version_minor = '201'
-oracle_version_build = '09'
-oracle_hash = '42970487e3af4f5aa5bca3f542482c60'
-
-install_oracle_jdk_jre = <<EOL
-  java::oracle {
-    'test_oracle_jre':
-      version       => '#{oracle_version_major}',
-      version_major => '#{oracle_version_major}u#{oracle_version_minor}',
-      version_minor => 'b#{oracle_version_build}',
-      url_hash      => '#{oracle_hash}',
-      java_se       => 'jre',
-  }
-  java::oracle {
-    'test_oracle_jdk':
-      version       => '#{oracle_version_major}',
-      version_major => '#{oracle_version_major}u#{oracle_version_minor}',
-      version_minor => 'b#{oracle_version_build}',
-      url_hash      => '#{oracle_hash}',
-      java_se       => 'jdk',
-  }
-EOL
-
-install_oracle_jre_jce = <<EOL
-  java::oracle {
-    'test_oracle_jre':
-      version       => '#{oracle_version_major}',
-      version_major => '#{oracle_version_major}u#{oracle_version_minor}',
-      version_minor => 'b#{oracle_version_build}',
-      url_hash      => '#{oracle_hash}',
-      java_se       => 'jre',
-      jce           => true,
-  }
-
-EOL
-
-install_oracle_jdk_jce = <<EOL
-  java::oracle {
-    'test_oracle_jdk':
-      version       => '#{oracle_version_major}',
-      version_major => '#{oracle_version_major}u#{oracle_version_minor}',
-      version_minor => 'b#{oracle_version_build}',
-      url_hash      => '#{oracle_hash}',
-      java_se       => 'jdk',
-      jce           => true,
-  }
-EOL
-
-context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+context 'installing java jre', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   it 'installs jre' do
-    idempotent_apply(default, java_class_jre)
+    idempotent_apply(java_class_jre)
   end
 end
 
-context 'installing java jdk', unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
+context 'installing java jdk', unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
   it 'installs jdk' do
-    idempotent_apply(default, java_class)
-  end
-end
-
-context 'oracle', if: (
-  (fact('operatingsystem') == 'Ubuntu') && fact('operatingsystemrelease').match(%r{^14\.04})
-) do
-  # not supported
-  # The package is not available from any sources, but if a customer
-  # custom-builds the package using java-package and adds it to a local
-  # repository, that is the intention of this version ability
-  describe 'jre' do
-    it 'installs oracle-jre' do
-      apply_manifest(oracle_jre, expect_failures: true)
-    end
-  end
-  describe 'jdk' do
-    it 'installs oracle-jdk' do
-      apply_manifest(oracle_jdk, expect_failures: true)
-    end
+    idempotent_apply(java_class)
   end
 end
 
@@ -154,40 +71,10 @@ context 'with failure cases' do
   end
 
   it 'fails on debian or RHEL when passed fake java_alternative and path' do
-    if fact('osfamily') == 'Debian' || fact('osfamily') == 'RedHat'
+    if os[:family] == 'debian' || os[:family] == 'redhat'
       apply_manifest(bogus_alternative, expect_failures: true)
     else
       apply_manifest(bogus_alternative, catch_failures: true)
     end
   end
 end
-
-context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do
-  let(:install_path) do
-    (fact('osfamily') == 'RedHat') ? '/usr/java' : '/usr/lib/jvm'
-  end
-
-  let(:version_suffix) do
-    (fact('osfamily') == 'RedHat') ? '-amd64' : ''
-  end
-
-  it 'installs oracle jdk and jre' do
-    idempotent_apply(default, install_oracle_jdk_jre)
-    jdk_result = shell("test ! -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
-    jre_result = shell("test ! -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
-    expect(jdk_result.exit_code).to eq(0)
-    expect(jre_result.exit_code).to eq(0)
-  end
-
-  it 'installs oracle jdk with jce' do
-    idempotent_apply(default, install_oracle_jdk_jce)
-    result = shell("test -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
-    expect(result.exit_code).to eq(0)
-  end
-
-  it 'installs oracle jre with jce' do
-    idempotent_apply(default, install_oracle_jre_jce)
-    result = shell("test -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
-    expect(result.exit_code).to eq(0)
-  end
-end

spec/acceptance/nodesets/centos-7-x64.yml

@@ -1,10 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    roles:
-      - agent
-      - default
-    platform: el-7-x86_64
-    hypervisor: vagrant
-    box: puppetlabs/centos-7.2-64-nocm
-CONFIG:
-  type: foss

spec/acceptance/nodesets/debian-8-x64.yml

@@ -1,10 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    roles:
-      - agent
-      - default
-    platform: debian-8-amd64
-    hypervisor: vagrant
-    box: puppetlabs/debian-8.2-64-nocm
-CONFIG:
-  type: foss

spec/acceptance/nodesets/default.yml

@@ -1,10 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    roles:
-      - agent
-      - default
-    platform: ubuntu-14.04-amd64
-    hypervisor: vagrant
-    box: puppetlabs/ubuntu-14.04-64-nocm
-CONFIG:
-  type: foss

spec/acceptance/nodesets/docker/centos-7.yml

@@ -1,12 +0,0 @@
-HOSTS:
-  centos-7-x64:
-    platform: el-7-x86_64
-    hypervisor: docker
-    image: centos:7
-    docker_preserve_image: true
-    docker_cmd: '["/usr/sbin/init"]'
-    # install various tools required to get the image up to usable levels
-    docker_image_commands:
-      - 'yum install -y crontabs tar wget openssl sysvinit-tools iproute which initscripts'
-CONFIG:
-  trace_limit: 200

spec/acceptance/nodesets/docker/debian-8.yml

@@ -1,11 +0,0 @@
-HOSTS:
-  debian-8-x64:
-    platform: debian-8-amd64
-    hypervisor: docker
-    image: debian:8
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      - 'apt-get update && apt-get install -y net-tools wget locales strace lsof && echo "en_US.UTF-8 UTF-8" > /etc/locale.gen && locale-gen'
-CONFIG:
-  trace_limit: 200

spec/acceptance/nodesets/docker/ubuntu-14.04.yml

@@ -1,12 +0,0 @@
-HOSTS:
-  ubuntu-1404-x64:
-    platform: ubuntu-14.04-amd64
-    hypervisor: docker
-    image: ubuntu:14.04
-    docker_preserve_image: true
-    docker_cmd: '["/sbin/init"]'
-    docker_image_commands:
-      # ensure that upstart is booting correctly in the container
-      - 'rm /usr/sbin/policy-rc.d && rm /sbin/initctl && dpkg-divert --rename --remove /sbin/initctl && apt-get update && apt-get install -y net-tools wget && locale-gen en_US.UTF-8'
-CONFIG:
-  trace_limit: 200