From 096196bd896bd822c8698156be54ad8e3c948a18 Mon Sep 17 00:00:00 2001 From: Hunter Haugen Date: Thu, 28 Aug 2014 16:38:23 -0700 Subject: [PATCH] Remove Sci 7 from readme and update oracle linux tests for ubuntu --- README.markdown | 4 ++-- spec/acceptance/install_spec.rb | 10 ++++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/README.markdown b/README.markdown index 361459e..34e8aa4 100644 --- a/README.markdown +++ b/README.markdown @@ -74,7 +74,7 @@ OpenJDK is supported on: * Red Hat Enterprise Linux (RHEL) 5, 6, 7 * CentOS 5, 6, 7 * Oracle Linux 5, 6, 7 -* Scientific Linux 5, 6, 7 +* Scientific Linux 5, 6 * Debian 6, 7 * Ubuntu 10.04, 12.04, 14.04 * Solaris 11 @@ -93,4 +93,4 @@ You can read the complete module contribution guide on the [Puppet Labs wiki](ht ##Contributors -The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors). \ No newline at end of file +The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors). diff --git a/spec/acceptance/install_spec.rb b/spec/acceptance/install_spec.rb index 7371fde..299ae82 100644 --- a/spec/acceptance/install_spec.rb +++ b/spec/acceptance/install_spec.rb @@ -92,12 +92,17 @@ describe 'sun', :if => (fact('operatingsystem') == 'Debian' and fact('operatings end # C14704 -describe 'oracle', :if => (fact('operatingsystem') == 'Debian' and fact('operatingsystemrelease').match(/^7/)) do +# C14705 +# C15006 +describe 'oracle', :if => ( + (fact('operatingsystem') == 'Debian' and fact('operatingsystemrelease').match(/^7/)) + or (fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease').match(/^12\.04/)) + or (fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease').match(/^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 - # C14704 describe 'jre' do it 'should install oracle-jre' do pp = <<-EOS @@ -189,6 +194,7 @@ describe 'failure cases' do end # C14717 # C14719 + # C14725 it 'should fail on debian when passed fake java_alternative and path' do pp = <<-EOS class { 'java':