Skip to content

Commit 096196b

Browse files
committed
Remove Sci 7 from readme and update oracle linux tests for ubuntu
1 parent a231ce8 commit 096196b

2 files changed

Lines changed: 10 additions & 4 deletions

File tree

‎README.markdown‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ OpenJDK is supported on:
7474
* Red Hat Enterprise Linux (RHEL) 5, 6, 7
7575
* CentOS 5, 6, 7
7676
* Oracle Linux 5, 6, 7
77-
* Scientific Linux 5, 6, 7
77+
* Scientific Linux 5, 6
7878
* Debian 6, 7
7979
* Ubuntu 10.04, 12.04, 14.04
8080
* Solaris 11
@@ -93,4 +93,4 @@ You can read the complete module contribution guide on the [Puppet Labs wiki](ht
9393

9494
##Contributors
9595

96-
The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors).
96+
The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors).

‎spec/acceptance/install_spec.rb‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,12 +92,17 @@ class { 'java':
9292
end
9393

9494
# C14704
95-
describe 'oracle', :if => (fact('operatingsystem') == 'Debian' and fact('operatingsystemrelease').match(/^7/)) do
95+
# C14705
96+
# C15006
97+
describe 'oracle', :if => (
98+
(fact('operatingsystem') == 'Debian' and fact('operatingsystemrelease').match(/^7/))
99+
or (fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease').match(/^12\.04/))
100+
or (fact('operatingsystem') == 'Ubuntu' and fact('operatingsystemrelease').match(/^14\.04/))
101+
) do
96102
# not supported
97103
# The package is not available from any sources, but if a customer
98104
# custom-builds the package using java-package and adds it to a local
99105
# repository, that is the intention of this version ability
100-
# C14704
101106
describe 'jre' do
102107
it 'should install oracle-jre' do
103108
pp = <<-EOS
@@ -189,6 +194,7 @@ class { 'java':
189194
end
190195
# C14717
191196
# C14719
197+
# C14725
192198
it 'should fail on debian when passed fake java_alternative and path' do
193199
pp = <<-EOS
194200
class { 'java':

0 commit comments

Comments
 (0)