Compare commits
25 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
72a801c1e9 | ||
|
|
e038a13474 | ||
|
|
ff158b6c68 | ||
|
|
addb6e0931 | ||
|
|
124abf1278 | ||
|
|
a45aee2567 | ||
|
|
a74be5a7f8 | ||
|
|
4f700ca1e3 | ||
|
|
519e2d7b77 | ||
|
|
4b5cbc4d33 | ||
|
|
f4d218a162 | ||
|
|
3d8d4d76e0 | ||
|
|
829b8d6448 | ||
|
|
aafb208671 | ||
|
|
de4dfde37a | ||
|
|
3fa562a033 | ||
|
|
b9a864e313 | ||
|
|
bc8bed2c65 | ||
|
|
4775718a2f | ||
|
|
1165f3aaa2 | ||
|
|
3f2825c5e2 | ||
|
|
8e0c06cba9 | ||
|
|
0e47d95a71 | ||
|
|
afcb95b10b | ||
|
|
7ab4bc1b37 |
17
.travis.yml
17
.travis.yml
@@ -3,18 +3,33 @@
|
||||
sudo: false
|
||||
language: ruby
|
||||
cache: bundler
|
||||
bundler_args: --without system_tests
|
||||
script: "bundle exec rake validate lint spec"
|
||||
matrix:
|
||||
fast_finish: true
|
||||
include:
|
||||
- rvm: 2.1.6
|
||||
dist: trusty
|
||||
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/ubuntu-14.04
|
||||
script: bundle exec rake beaker
|
||||
services: docker
|
||||
sudo: required
|
||||
- rvm: 2.1.6
|
||||
dist: trusty
|
||||
env: PUPPET_INSTALL_TYPE=agent BEAKER_debug=true BEAKER_set=docker/centos-7
|
||||
script: bundle exec rake beaker
|
||||
services: docker
|
||||
sudo: required
|
||||
- rvm: 2.1.6
|
||||
bundler_args: --without system_tests
|
||||
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
|
||||
- rvm: 2.1.5
|
||||
bundler_args: --without system_tests
|
||||
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
|
||||
- rvm: 2.1.5
|
||||
bundler_args: --without system_tests
|
||||
env: PUPPET_GEM_VERSION="~> 3.0"
|
||||
- rvm: 1.9.3
|
||||
bundler_args: --without system_tests
|
||||
env: PUPPET_GEM_VERSION="~> 3.0"
|
||||
notifications:
|
||||
email: false
|
||||
|
||||
18
CHANGELOG.md
18
CHANGELOG.md
@@ -1,3 +1,21 @@
|
||||
## Supported Release 1.6.0
|
||||
### Summary
|
||||
|
||||
Addition of a new supported OS, along with several other features and bugfixes.
|
||||
|
||||
#### Features
|
||||
- Ubuntu 16.04 support.
|
||||
- Addition example for installing Java 8.
|
||||
- Update to newest modulesync_configs.
|
||||
- Addition of RedHat for Oracle Java.
|
||||
|
||||
#### Bugfixes
|
||||
- Custom archive type now given extract_path.
|
||||
- Fix for rspec deprectation warnings.
|
||||
- Typo fixes for readme.
|
||||
- Fixed tests to run under strict variables.
|
||||
- Updated Java package for SLES 11.4.
|
||||
|
||||
## Supported Release 1.5.0
|
||||
### Summary
|
||||
|
||||
|
||||
@@ -26,7 +26,7 @@ To install the correct Java package on your system, include the `java` class: `i
|
||||
|
||||
##Usage
|
||||
|
||||
The java module installs the correct jdk or jre package on a wide variety of systems. By default, the module will install the jdk package, but you can set different installation parameters as needed. For example, to install jre instead of jdk, you would set the distribution parameter:
|
||||
The java module installs the correct jdk or jre package on a wide variety of systems. By default, the module installs the jdk package, but you can set different installation parameters as needed. For example, to install jre instead of jdk, you would set the distribution parameter:
|
||||
|
||||
~~~
|
||||
class { 'java':
|
||||
@@ -34,6 +34,14 @@ class { 'java':
|
||||
}
|
||||
~~~
|
||||
|
||||
To install the latest patch version of Java 8 on CentOS
|
||||
|
||||
~~~
|
||||
class { 'java' :
|
||||
package => 'java-1.8.0-openjdk-devel',
|
||||
}
|
||||
~~~
|
||||
|
||||
The defined type `java::oracle` installs one or more versions of Oracle Java SE. `java::oracle` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive). By using `java::oracle` you agree to Oracle's licensing terms for Java SE.
|
||||
|
||||
~~~
|
||||
@@ -81,7 +89,7 @@ Valid options: Run command `update-java-alternatives -l` for a list of available
|
||||
Valid option: String. Default: OS and distribution dependent defaults on *deb systems, undef on others.
|
||||
|
||||
#####`package`
|
||||
Specifies the name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module will install the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter will do nothing.
|
||||
Specifies the name of the Java package. This is configurable in case you want to install a non-standard Java package. If not set, the module installs the appropriate package for the `distribution` parameter and target platform. If you set `package`, the `distribution` parameter does nothing.
|
||||
Valid option: String. Default: undef.
|
||||
|
||||
#####`version`
|
||||
@@ -126,7 +134,7 @@ This module cannot guarantee installation of Java versions that are not availabl
|
||||
|
||||
This module only manages a singular installation of Java, meaning it is not possible to manage e.g. OpenJDK 7, Oracle Java 7 and Oracle Java 8 in parallel on the same system.
|
||||
|
||||
Oracle Java packages are not included in Debian 7 and Ubuntu 12.04/14.04 repositories. To install Java on those systems, you'll need to package Oracle JDK/JRE, and then the module will be able to install the package. For more information on how to package Oracle JDK/JRE, see the [Debian wiki](http://wiki.debian.org/JavaPackage).
|
||||
Oracle Java packages are not included in Debian 7 and Ubuntu 12.04/14.04 repositories. To install Java on those systems, you'll need to package Oracle JDK/JRE, and then the module can install the package. For more information on how to package Oracle JDK/JRE, see the [Debian wiki](http://wiki.debian.org/JavaPackage).
|
||||
|
||||
This module is officially [supported](https://forge.puppetlabs.com/supported) for the following Java versions and platforms:
|
||||
|
||||
@@ -149,19 +157,20 @@ Sun Java is supported on:
|
||||
Oracle Java is supported on:
|
||||
* CentOS 6
|
||||
|
||||
### A note to OpenBSD
|
||||
### A note about OpenBSD
|
||||
OpenBSD packages install Java JRE/JDK in a unique directory structure, not linking
|
||||
the binaries to a standard directory. Because of that, the path to this location
|
||||
is hardcoded in the java_version fact. Whenever a Java upgrade to a newer
|
||||
version/path will be done on OpenBSD, it has to be adapted there.
|
||||
|
||||
### A note to FreeBSD
|
||||
### A note about FreeBSD
|
||||
By default on FreeBSD Puppet < 4.0, you will see an error as `pkgng` is not the default provider. To fix this, you can install the [zleslie/pkgng module](https://forge.puppetlabs.com/zleslie/pkgng) and set it as the default package provider like so:
|
||||
|
||||
```puppet
|
||||
Package {
|
||||
provider => 'pkgng',
|
||||
}
|
||||
```
|
||||
|
||||
On Puppet > 4.0 (ie. using the sysutils/puppet4 port), `pkgng` is included within Puppet and it's the default package provider.
|
||||
|
||||
|
||||
@@ -60,8 +60,8 @@
|
||||
# [*install_command*]
|
||||
# Installation command used to install Oracle java_se. Installation commands
|
||||
# differ by package_type. 'bin' types are installed via shell command. 'rpmbin'
|
||||
# types have the rpms extracted and then foricibly installed. 'rpm' types are
|
||||
# foricibly installed.
|
||||
# types have the rpms extracted and then forcibly installed. 'rpm' types are
|
||||
# forcibly installed.
|
||||
#
|
||||
# [*url*]
|
||||
# Full URL, including oracle_url, release_major, release_minor and package_name, to
|
||||
@@ -115,7 +115,7 @@ define java::oracle (
|
||||
case $::kernel {
|
||||
'Linux' : {
|
||||
case $::operatingsystem {
|
||||
'CentOS' : {
|
||||
'CentOS', 'RedHat' : {
|
||||
# Oracle Java 6 comes in a special rpmbin format
|
||||
if $version == '6' {
|
||||
$package_type = 'rpmbin'
|
||||
@@ -191,6 +191,7 @@ define java::oracle (
|
||||
ensure => present,
|
||||
source => "${oracle_url}${release_major}-${release_minor}/${package_name}",
|
||||
cleanup => false,
|
||||
extract_path => '/tmp',
|
||||
cookie => 'gpw_e24=http%3A%2F%2Fwww.oracle.com%2F; oraclelicense=accept-securebackup-cookie',
|
||||
}->
|
||||
case $::kernel {
|
||||
|
||||
@@ -124,7 +124,7 @@ class java::params {
|
||||
},
|
||||
}
|
||||
}
|
||||
'vivid', 'wily': {
|
||||
'vivid', 'wily', 'xenial': {
|
||||
$java = {
|
||||
'jdk' => {
|
||||
'package' => 'openjdk-8-jdk',
|
||||
@@ -164,15 +164,15 @@ class java::params {
|
||||
'Suse': {
|
||||
case $::operatingsystem {
|
||||
'SLES': {
|
||||
case $::operatingsystemmajrelease{
|
||||
default: {
|
||||
$jdk_package = 'java-1_6_0-ibm-devel'
|
||||
$jre_package = 'java-1_6_0-ibm'
|
||||
}
|
||||
'12': {
|
||||
if (versioncmp($::operatingsystemrelease, '12') >= 0) {
|
||||
$jdk_package = 'java-1_7_0-openjdk-devel'
|
||||
$jre_package = 'java-1_7_0-openjdk'
|
||||
}
|
||||
} elsif (versioncmp($::operatingsystemrelease, '11.4') >= 0) {
|
||||
$jdk_package = 'java-1_7_0-ibm-devel'
|
||||
$jre_package = 'java-1_7_0-ibm'
|
||||
} else {
|
||||
$jdk_package = 'java-1_6_0-ibm-devel'
|
||||
$jre_package = 'java-1_6_0-ibm'
|
||||
}
|
||||
}
|
||||
'OpenSuSE': {
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "puppetlabs-java",
|
||||
"version": "1.5.0",
|
||||
"version": "1.6.0",
|
||||
"author": "puppetlabs",
|
||||
"summary": "Installs the correct Java package on various platforms.",
|
||||
"license": "Apache-2.0",
|
||||
@@ -59,7 +59,8 @@
|
||||
"operatingsystemrelease": [
|
||||
"10.04",
|
||||
"12.04",
|
||||
"14.04"
|
||||
"14.04",
|
||||
"16.04"
|
||||
]
|
||||
},
|
||||
{
|
||||
|
||||
@@ -1,15 +0,0 @@
|
||||
HOSTS:
|
||||
'centos-5-vcloud':
|
||||
roles:
|
||||
- master
|
||||
platform: el-5-x86_64
|
||||
hypervisor: vcloud
|
||||
template: centos-5-x86_64
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
@@ -1,12 +0,0 @@
|
||||
HOSTS:
|
||||
centos-59-x64:
|
||||
roles:
|
||||
- master
|
||||
- database
|
||||
- console
|
||||
platform: el-5-x86_64
|
||||
box : centos-59-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: pe
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
centos-59-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: el-5-x86_64
|
||||
box : centos-59-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-59-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: git
|
||||
@@ -1,15 +0,0 @@
|
||||
HOSTS:
|
||||
'centos-6-vcloud':
|
||||
roles:
|
||||
- master
|
||||
platform: el-6-x86_64
|
||||
hypervisor: vcloud
|
||||
template: centos-6-x86_64
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
centos-64-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: el-6-x86_64
|
||||
box : centos-64-x64-fusion503-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-fusion503-nocm.box
|
||||
hypervisor : fusion
|
||||
CONFIG:
|
||||
type: foss
|
||||
@@ -1,12 +0,0 @@
|
||||
HOSTS:
|
||||
centos-64-x64:
|
||||
roles:
|
||||
- master
|
||||
- database
|
||||
- dashboard
|
||||
platform: el-6-x86_64
|
||||
box : centos-64-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: pe
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
centos-64-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: el-6-x86_64
|
||||
box : centos-64-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: foss
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
centos-65-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: el-6-x86_64
|
||||
box : centos-65-x64-vbox436-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-65-x64-virtualbox-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: foss
|
||||
@@ -1,15 +0,0 @@
|
||||
HOSTS:
|
||||
'centos-7-vcloud':
|
||||
roles:
|
||||
- master
|
||||
platform: el-7-x86_64
|
||||
hypervisor: vcloud
|
||||
template: centos-7-x86_64
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
10
spec/acceptance/nodesets/centos-7-x64.yml
Normal file
10
spec/acceptance/nodesets/centos-7-x64.yml
Normal file
@@ -0,0 +1,10 @@
|
||||
HOSTS:
|
||||
centos-7-x64:
|
||||
roles:
|
||||
- agent
|
||||
- default
|
||||
platform: redhat-7-x86_64
|
||||
hypervisor: vagrant
|
||||
box: puppetlabs/centos-7.2-64-nocm
|
||||
CONFIG:
|
||||
type: foss
|
||||
@@ -1,15 +0,0 @@
|
||||
HOSTS:
|
||||
'debian-6-amd64':
|
||||
roles:
|
||||
- master
|
||||
platform: debian-6-amd64
|
||||
hypervisor: vcloud
|
||||
template: debian-6-x86_64
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
debian-607-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: debian-6-amd64
|
||||
box : debian-607-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-607-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: git
|
||||
@@ -1,15 +0,0 @@
|
||||
HOSTS:
|
||||
'debian-7-amd64':
|
||||
roles:
|
||||
- master
|
||||
platform: debian-7-amd64
|
||||
hypervisor: vcloud
|
||||
template: debian-7-x86_64
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
debian-70rc1-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: debian-7-amd64
|
||||
box : debian-70rc1-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/debian-70rc1-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: git
|
||||
10
spec/acceptance/nodesets/debian-8-x64.yml
Normal file
10
spec/acceptance/nodesets/debian-8-x64.yml
Normal file
@@ -0,0 +1,10 @@
|
||||
HOSTS:
|
||||
debian-8-x64:
|
||||
roles:
|
||||
- agent
|
||||
- default
|
||||
platform: debian-8-amd64
|
||||
hypervisor: vagrant
|
||||
box: puppetlabs/debian-8.2-64-nocm
|
||||
CONFIG:
|
||||
type: foss
|
||||
@@ -1,10 +1,10 @@
|
||||
HOSTS:
|
||||
centos-64-x64:
|
||||
ubuntu-1404-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: el-6-x86_64
|
||||
box : centos-64-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/centos-64-x64-vbox4210-nocm.box
|
||||
- agent
|
||||
- default
|
||||
platform: ubuntu-14.04-amd64
|
||||
hypervisor: vagrant
|
||||
box: puppetlabs/ubuntu-14.04-64-nocm
|
||||
CONFIG:
|
||||
type: foss
|
||||
|
||||
12
spec/acceptance/nodesets/docker/centos-7.yml
Normal file
12
spec/acceptance/nodesets/docker/centos-7.yml
Normal file
@@ -0,0 +1,12 @@
|
||||
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
|
||||
11
spec/acceptance/nodesets/docker/debian-8.yml
Normal file
11
spec/acceptance/nodesets/docker/debian-8.yml
Normal file
@@ -0,0 +1,11 @@
|
||||
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
|
||||
12
spec/acceptance/nodesets/docker/ubuntu-14.04.yml
Normal file
12
spec/acceptance/nodesets/docker/ubuntu-14.04.yml
Normal file
@@ -0,0 +1,12 @@
|
||||
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
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
fedora-18-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: fedora-18-x86_64
|
||||
box : fedora-18-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/fedora-18-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: git
|
||||
@@ -1,15 +0,0 @@
|
||||
HOSTS:
|
||||
'redhat-7-vcloud':
|
||||
roles:
|
||||
- master
|
||||
platform: el-7-x86_64
|
||||
hypervisor: vcloud
|
||||
template: redhat-7-x86_64
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
@@ -1,16 +0,0 @@
|
||||
HOSTS:
|
||||
'sles-11-vcloud':
|
||||
roles:
|
||||
- master
|
||||
platform: sles-11-x86_64
|
||||
hypervisor: vcloud
|
||||
template: sles-11-x86_64
|
||||
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
sles-11sp1-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: sles-11-x86_64
|
||||
box : sles-11sp1-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/sles-11sp1-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: git
|
||||
@@ -1,15 +0,0 @@
|
||||
HOSTS:
|
||||
'solaris-11-vcloud':
|
||||
roles:
|
||||
- master
|
||||
platform: solaris-11-i386
|
||||
hypervisor: vcloud
|
||||
template: solaris-11-x86_64
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
@@ -1,15 +0,0 @@
|
||||
HOSTS:
|
||||
'ubuntu-1004-amd64':
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-10.04-amd64
|
||||
hypervisor: vcloud
|
||||
template: ubuntu-1004-x86_64
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
@@ -1,15 +0,0 @@
|
||||
HOSTS:
|
||||
'ubuntu-1404-amd64':
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-14.04-amd64
|
||||
hypervisor: vcloud
|
||||
template: ubuntu-1404-x86_64
|
||||
CONFIG:
|
||||
type: foss
|
||||
ssh:
|
||||
keys: "~/.ssh/id_rsa-acceptance"
|
||||
datastore: instance0
|
||||
folder: Delivery/Quality Assurance/Enterprise/Dynamic
|
||||
resourcepool: delivery/Quality Assurance/Enterprise/Dynamic
|
||||
pooling_api: http://vcloud.delivery.puppetlabs.net/
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
ubuntu-server-10044-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-10.04-amd64
|
||||
box : ubuntu-server-10044-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-10044-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: foss
|
||||
@@ -1,10 +0,0 @@
|
||||
HOSTS:
|
||||
ubuntu-server-12042-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-12.04-amd64
|
||||
box : ubuntu-server-12042-x64-vbox4210-nocm
|
||||
box_url : http://puppet-vagrant-boxes.puppetlabs.com/ubuntu-server-12042-x64-vbox4210-nocm.box
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
type: foss
|
||||
@@ -1,11 +0,0 @@
|
||||
HOSTS:
|
||||
ubuntu-server-1404-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-14.04-amd64
|
||||
box : puppetlabs/ubuntu-14.04-64-nocm
|
||||
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
log_level : debug
|
||||
type: git
|
||||
@@ -1,11 +0,0 @@
|
||||
HOSTS:
|
||||
ubuntu-server-1504-x64:
|
||||
roles:
|
||||
- master
|
||||
platform: ubuntu-15.04-amd64
|
||||
box : puppetlabs/ubuntu-15.04-64-nocm
|
||||
box_url : https://vagrantcloud.com/puppetlabs/ubuntu-15.04-64-nocm
|
||||
hypervisor : vagrant
|
||||
CONFIG:
|
||||
log_level : debug
|
||||
type: git
|
||||
@@ -4,181 +4,196 @@ describe 'java', :type => :class do
|
||||
|
||||
context 'select openjdk for Centos 5.8' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8'} }
|
||||
it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
|
||||
end
|
||||
|
||||
context 'select openjdk for Centos 6.3' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3'} }
|
||||
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
||||
end
|
||||
|
||||
context 'select openjdk for Centos 7.1.1503' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '7.1.1503'} }
|
||||
it { should contain_package('java').with_name('java-1.8.0-openjdk-devel') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
|
||||
end
|
||||
|
||||
context 'select openjdk for Centos 6.2' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2'} }
|
||||
it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
|
||||
it { should_not contain_exec('update-java-alternatives') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
|
||||
it { is_expected.to_not contain_exec('update-java-alternatives') }
|
||||
end
|
||||
|
||||
context 'select Oracle JRE with alternatives for Centos 6.3' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3'} }
|
||||
let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/usr/java/jre1.7.0_67/bin/java'} }
|
||||
it { should contain_package('java').with_name('jre') }
|
||||
it { should contain_exec('create-java-alternatives').with_command('alternatives --install /usr/bin/java java /usr/java/jre1.7.0_67/bin/java 20000') }
|
||||
it { should contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') }
|
||||
it { is_expected.to contain_package('java').with_name('jre') }
|
||||
it { is_expected.to contain_exec('create-java-alternatives').with_command('alternatives --install /usr/bin/java java /usr/java/jre1.7.0_67/bin/java 20000') }
|
||||
it { is_expected.to contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') }
|
||||
end
|
||||
|
||||
context 'select openjdk for Fedora 20' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} }
|
||||
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
||||
end
|
||||
|
||||
context 'select openjdk for Fedora 21' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
|
||||
it { should contain_package('java').with_name('java-1.8.0-openjdk-devel') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk-devel') }
|
||||
end
|
||||
|
||||
context 'select passed value for Fedora 20' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} }
|
||||
let(:params) { { 'distribution' => 'jre' } }
|
||||
it { should contain_package('java').with_name('java-1.7.0-openjdk') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
|
||||
end
|
||||
|
||||
context 'select passed value for Fedora 21' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
|
||||
let(:params) { { 'distribution' => 'jre' } }
|
||||
it { should contain_package('java').with_name('java-1.8.0-openjdk') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.8.0-openjdk') }
|
||||
end
|
||||
|
||||
context 'select passed value for Fedora 21 with yum option' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} }
|
||||
let(:params) { { 'distribution' => 'jre' } }
|
||||
let(:params) { { 'package_options' => ['--skip-broken'] } }
|
||||
it { should contain_package('java') }
|
||||
it { is_expected.to contain_package('java') }
|
||||
end
|
||||
|
||||
context 'select passed value for Centos 5.3' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
|
||||
let(:params) { { 'package' => 'jdk' } }
|
||||
it { should contain_package('java').with_name('jdk') }
|
||||
it { should_not contain_exec('update-java-alternatives') }
|
||||
it { is_expected.to contain_package('java').with_name('jdk') }
|
||||
it { is_expected.to_not contain_exec('update-java-alternatives') }
|
||||
end
|
||||
|
||||
context 'select default for Centos 5.3' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.3'} }
|
||||
it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
|
||||
it { should_not contain_exec('update-java-alternatives') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
|
||||
it { is_expected.to_not contain_exec('update-java-alternatives') }
|
||||
end
|
||||
|
||||
context 'select default for Debian Wheezy' do
|
||||
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
|
||||
it { should contain_package('java').with_name('openjdk-7-jdk') }
|
||||
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre') }
|
||||
it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
|
||||
it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre') }
|
||||
end
|
||||
|
||||
context 'select Oracle JRE for Debian Wheezy' do
|
||||
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
|
||||
let(:params) { { 'distribution' => 'oracle-jre' } }
|
||||
it { should contain_package('java').with_name('oracle-j2re1.7') }
|
||||
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set j2re1.7-oracle --jre') }
|
||||
it { is_expected.to contain_package('java').with_name('oracle-j2re1.7') }
|
||||
it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set j2re1.7-oracle --jre') }
|
||||
end
|
||||
|
||||
context 'select OpenJDK JRE for Debian Wheezy' do
|
||||
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
|
||||
let(:params) { { 'distribution' => 'jre' } }
|
||||
it { should contain_package('java').with_name('openjdk-7-jre-headless') }
|
||||
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre-headless') }
|
||||
it { is_expected.to contain_package('java').with_name('openjdk-7-jre-headless') }
|
||||
it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-1.7.0-openjdk-amd64 --jre-headless') }
|
||||
end
|
||||
|
||||
context 'select default for Debian Squeeze' do
|
||||
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'squeeze', :operatingsystemrelease => '6.0.5', :architecture => 'amd64',} }
|
||||
it { should contain_package('java').with_name('openjdk-6-jdk') }
|
||||
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre') }
|
||||
it { is_expected.to contain_package('java').with_name('openjdk-6-jdk') }
|
||||
it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre') }
|
||||
end
|
||||
|
||||
context 'select Oracle JRE for Debian Squeeze' do
|
||||
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'squeeze', :operatingsystemrelease => '6.0.5', :architecture => 'amd64',} }
|
||||
let(:params) { { 'distribution' => 'sun-jre', } }
|
||||
it { should contain_package('java').with_name('sun-java6-jre') }
|
||||
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-sun --jre') }
|
||||
it { is_expected.to contain_package('java').with_name('sun-java6-jre') }
|
||||
it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-sun --jre') }
|
||||
end
|
||||
|
||||
context 'select OpenJDK JRE for Debian Squeeze' do
|
||||
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'squeeze', :operatingsystemrelease => '6.0.5', :architecture => 'amd64',} }
|
||||
let(:params) { { 'distribution' => 'jre', } }
|
||||
it { should contain_package('java').with_name('openjdk-6-jre-headless') }
|
||||
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre-headless') }
|
||||
it { is_expected.to contain_package('java').with_name('openjdk-6-jre-headless') }
|
||||
it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-6-openjdk-amd64 --jre-headless') }
|
||||
end
|
||||
|
||||
context 'select random alternative for Debian Wheezy' do
|
||||
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Debian', :lsbdistcodename => 'wheezy', :operatingsystemrelease => '7.1', :architecture => 'amd64',} }
|
||||
let(:params) { { 'java_alternative' => 'bananafish' } }
|
||||
it { should contain_package('java').with_name('openjdk-7-jdk') }
|
||||
it { should contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
|
||||
it { is_expected.to contain_package('java').with_name('openjdk-7-jdk') }
|
||||
it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set bananafish --jre') }
|
||||
end
|
||||
|
||||
context 'select jdk for Ubuntu Vivid (15.04)' do
|
||||
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
|
||||
let(:params) { { 'distribution' => 'jdk' } }
|
||||
it { should contain_package('java').with_name('openjdk-8-jdk') }
|
||||
it { is_expected.to contain_package('java').with_name('openjdk-8-jdk') }
|
||||
end
|
||||
|
||||
context 'select jre for Ubuntu Vivid (15.04)' do
|
||||
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} }
|
||||
let(:params) { { 'distribution' => 'jre' } }
|
||||
it { should contain_package('java').with_name('openjdk-8-jre-headless') }
|
||||
it { is_expected.to contain_package('java').with_name('openjdk-8-jre-headless') }
|
||||
end
|
||||
|
||||
context 'select openjdk for Amazon Linux' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} }
|
||||
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
||||
end
|
||||
|
||||
context 'select passed value for Amazon Linux' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64'} }
|
||||
let(:params) { { 'distribution' => 'jre' } }
|
||||
it { should contain_package('java').with_name('java-1.7.0-openjdk') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
|
||||
end
|
||||
|
||||
context 'select openjdk for Oracle Linux' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.4'} }
|
||||
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk-devel') }
|
||||
end
|
||||
|
||||
context 'select openjdk for Oracle Linux 6.2' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.2'} }
|
||||
it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
|
||||
end
|
||||
|
||||
context 'select passed value for Oracle Linux' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.3'} }
|
||||
let(:params) { { 'distribution' => 'jre' } }
|
||||
it { should contain_package('java').with_name('java-1.7.0-openjdk') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
|
||||
end
|
||||
|
||||
context 'select passed value for Scientific Linux' do
|
||||
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4'} }
|
||||
let(:params) { { 'distribution' => 'jre' } }
|
||||
it { should contain_package('java').with_name('java-1.7.0-openjdk') }
|
||||
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
|
||||
end
|
||||
|
||||
context 'select default for OpenSUSE 12.3' do
|
||||
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}}
|
||||
it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel')}
|
||||
end
|
||||
|
||||
context 'select default for SLES 11.3' do
|
||||
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.3'}}
|
||||
it { should contain_package('java').with_name('java-1_6_0-ibm-devel')}
|
||||
end
|
||||
|
||||
context 'select default for SLES 11.4' do
|
||||
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '11.4'}}
|
||||
it { should contain_package('java').with_name('java-1_7_0-ibm-devel')}
|
||||
end
|
||||
|
||||
context 'select default for SLES 12.1' do
|
||||
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'SLES', :operatingsystemrelease => '12.1', :operatingsystemmajrelease => '12'}}
|
||||
it { should contain_package('java').with_name('java-1_7_0-openjdk-devel')}
|
||||
end
|
||||
|
||||
context 'select jdk for OpenBSD' do
|
||||
let(:facts) { {:osfamily => 'OpenBSD'} }
|
||||
it { should contain_package('java').with_name('jdk') }
|
||||
it { is_expected.to contain_package('java').with_name('jdk') }
|
||||
end
|
||||
|
||||
context 'select jre for OpenBSD' do
|
||||
let(:facts) { {:osfamily => 'OpenBSD'} }
|
||||
let(:params) { { 'distribution' => 'jre' } }
|
||||
it { should contain_package('java').with_name('jre') }
|
||||
it { is_expected.to contain_package('java').with_name('jre') }
|
||||
end
|
||||
|
||||
describe 'incompatible OSs' do
|
||||
@@ -215,7 +230,7 @@ describe 'java', :type => :class do
|
||||
},
|
||||
].each do |facts|
|
||||
let(:facts) { facts }
|
||||
it "should fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
|
||||
it "is_expected.to fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
|
||||
expect { catalogue }.to raise_error Puppet::Error, /unsupported platform/
|
||||
end
|
||||
end
|
||||
|
||||
@@ -7,43 +7,43 @@ describe 'java::oracle', :type => :define do
|
||||
context 'Oracle Java SE 6 JDK' do
|
||||
let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jdk'} }
|
||||
let :title do 'jdk6' end
|
||||
it { should contain_archive('/tmp/jdk-6u45-linux-x64-rpm.bin')}
|
||||
it { should contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-x64-rpm.bin')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
|
||||
end
|
||||
|
||||
context 'Oracle Java SE 7 JDK' do
|
||||
let(:params) { {:ensure => 'present', :version => '7', :java_se => 'jdk'} }
|
||||
let :title do 'jdk7' end
|
||||
it { should contain_archive('/tmp/jdk-7u80-linux-x64.rpm')}
|
||||
it { should contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-x64.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-x64.rpm')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-x64.rpm') }
|
||||
end
|
||||
|
||||
context 'Oracle Java SE 8 JDK' do
|
||||
let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jdk'} }
|
||||
let :title do 'jdk8' end
|
||||
it { should contain_archive('/tmp/jdk-8u51-linux-x64.rpm')}
|
||||
it { should contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-x64.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jdk-8u51-linux-x64.rpm')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-x64.rpm') }
|
||||
end
|
||||
|
||||
context 'Oracle Java SE 6 JRE' do
|
||||
let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jre'} }
|
||||
let :title do 'jre6' end
|
||||
it { should contain_archive('/tmp/jre-6u45-linux-x64-rpm.bin')}
|
||||
it { should contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jre-6u45-linux-x64-rpm.bin')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-x64-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
|
||||
end
|
||||
|
||||
context 'Oracle Java SE 7 JRE' do
|
||||
let(:params) { {:ensure => 'present', :version => '7', :java_se => 'jre'} }
|
||||
let :title do 'jre7' end
|
||||
it { should contain_archive('/tmp/jre-7u80-linux-x64.rpm')}
|
||||
it { should contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-x64.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jre-7u80-linux-x64.rpm')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-x64.rpm') }
|
||||
end
|
||||
|
||||
context 'select Oracle Java SE 8 JRE' do
|
||||
let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jre'} }
|
||||
let :title do 'jre8' end
|
||||
it { should contain_archive('/tmp/jre-8u51-linux-x64.rpm')}
|
||||
it { should contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-x64.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jre-8u51-linux-x64.rpm')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-x64.rpm') }
|
||||
end
|
||||
|
||||
end
|
||||
@@ -54,43 +54,43 @@ describe 'java::oracle', :type => :define do
|
||||
context 'select Oracle Java SE 6 JDK on RedHat family, 32-bit' do
|
||||
let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jdk'} }
|
||||
let :title do 'jdk6' end
|
||||
it { should contain_archive('/tmp/jdk-6u45-linux-i586-rpm.bin')}
|
||||
it { should contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jdk-6u45-linux-i586-rpm.bin')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jdk 6').with_command('sh /tmp/jdk-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jdk*.rpm') }
|
||||
end
|
||||
|
||||
context 'select Oracle Java SE 7 JDK on RedHat family, 32-bit' do
|
||||
let(:params) { {:ensure => 'present', :version => '7', :java_se => 'jdk'} }
|
||||
let :title do 'jdk7' end
|
||||
it { should contain_archive('/tmp/jdk-7u80-linux-i586.rpm')}
|
||||
it { should contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-i586.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jdk-7u80-linux-i586.rpm')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jdk 7').with_command('rpm --force -iv /tmp/jdk-7u80-linux-i586.rpm') }
|
||||
end
|
||||
|
||||
context 'select Oracle Java SE 8 JDK on RedHat family, 32-bit' do
|
||||
let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jdk'} }
|
||||
let :title do 'jdk8' end
|
||||
it { should contain_archive('/tmp/jdk-8u51-linux-i586.rpm')}
|
||||
it { should contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-i586.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jdk-8u51-linux-i586.rpm')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jdk 8').with_command('rpm --force -iv /tmp/jdk-8u51-linux-i586.rpm') }
|
||||
end
|
||||
|
||||
context 'select Oracle Java SE 6 JRE on RedHat family, 32-bit' do
|
||||
let(:params) { {:ensure => 'present', :version => '6', :java_se => 'jre'} }
|
||||
let :title do 'jdk6' end
|
||||
it { should contain_archive('/tmp/jre-6u45-linux-i586-rpm.bin')}
|
||||
it { should contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jre-6u45-linux-i586-rpm.bin')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jre 6').with_command('sh /tmp/jre-6u45-linux-i586-rpm.bin -x; rpm --force -iv sun*.rpm; rpm --force -iv jre*.rpm') }
|
||||
end
|
||||
|
||||
context 'select Oracle Java SE 7 JRE on RedHat family, 32-bit' do
|
||||
let(:params) { {:ensure => 'present', :version => '7', :java_se => 'jre'} }
|
||||
let :title do 'jdk7' end
|
||||
it { should contain_archive('/tmp/jre-7u80-linux-i586.rpm')}
|
||||
it { should contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-i586.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jre-7u80-linux-i586.rpm')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jre 7').with_command('rpm --force -iv /tmp/jre-7u80-linux-i586.rpm') }
|
||||
end
|
||||
|
||||
context 'select Oracle Java SE 8 JRE on RedHat family, 32-bit' do
|
||||
let(:params) { {:ensure => 'present', :version => '8', :java_se => 'jre'} }
|
||||
let :title do 'jdk8' end
|
||||
it { should contain_archive('/tmp/jre-8u51-linux-i586.rpm')}
|
||||
it { should contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-i586.rpm') }
|
||||
it { is_expected.to contain_archive('/tmp/jre-8u51-linux-i586.rpm')}
|
||||
it { is_expected.to contain_exec('Install Oracle java_se jre 8').with_command('rpm --force -iv /tmp/jre-8u51-linux-i586.rpm') }
|
||||
end
|
||||
end
|
||||
|
||||
@@ -98,6 +98,7 @@ describe 'java::oracle', :type => :define do
|
||||
[
|
||||
{
|
||||
# C14706
|
||||
:kernel => 'windows',
|
||||
:osfamily => 'windows',
|
||||
:operatingsystem => 'windows',
|
||||
:operatingsystemrelease => '8.1',
|
||||
@@ -105,6 +106,7 @@ describe 'java::oracle', :type => :define do
|
||||
},
|
||||
{
|
||||
# C14707
|
||||
:kernel => 'Darwin',
|
||||
:osfamily => 'Darwin',
|
||||
:operatingsystem => 'Darwin',
|
||||
:operatingsystemrelease => '13.3.0',
|
||||
@@ -112,6 +114,7 @@ describe 'java::oracle', :type => :define do
|
||||
},
|
||||
{
|
||||
# C14708
|
||||
:kernel => 'AIX',
|
||||
:osfamily => 'AIX',
|
||||
:operatingsystem => 'AIX',
|
||||
:operatingsystemrelease => '7100-02-00-000',
|
||||
@@ -119,6 +122,7 @@ describe 'java::oracle', :type => :define do
|
||||
},
|
||||
{
|
||||
# C14708
|
||||
:kernel => 'AIX',
|
||||
:osfamily => 'AIX',
|
||||
:operatingsystem => 'AIX',
|
||||
:operatingsystemrelease => '6100-07-04-1216',
|
||||
@@ -126,6 +130,7 @@ describe 'java::oracle', :type => :define do
|
||||
},
|
||||
{
|
||||
# C14708
|
||||
:kernel => 'AIX',
|
||||
:osfamily => 'AIX',
|
||||
:operatingsystem => 'AIX',
|
||||
:operatingsystemrelease => '5300-12-01-1016',
|
||||
@@ -134,7 +139,7 @@ describe 'java::oracle', :type => :define do
|
||||
].each do |facts|
|
||||
let(:facts) { facts }
|
||||
let :title do 'jdk' end
|
||||
it "should fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
|
||||
it "is_expected.to fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
|
||||
expect { catalogue }.to raise_error Puppet::Error, /unsupported platform/
|
||||
end
|
||||
end
|
||||
|
||||
@@ -14,7 +14,7 @@ describe Facter::Util::Fact do
|
||||
EOS
|
||||
Facter::Util::Resolution.expects(:which).with("readlink").returns(true)
|
||||
Facter::Util::Resolution.expects(:exec).with("readlink -e /usr/bin/java").returns(java_path_output)
|
||||
Facter.value(:java_default_home).should == "/usr/lib/jvm/java-7-openjdk-amd64"
|
||||
expect(Facter.value(:java_default_home)).to eql "/usr/lib/jvm/java-7-openjdk-amd64"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -22,7 +22,7 @@ describe Facter::Util::Fact do
|
||||
it do
|
||||
Facter::Util::Resolution.stubs(:exec)
|
||||
Facter::Util::Resolution.expects(:which).with("readlink").at_least(1).returns(false)
|
||||
Facter.value(:java_default_home).should be_nil
|
||||
expect(Facter.value(:java_default_home)).to be_nil
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -13,7 +13,7 @@ describe Facter::Util::Fact do
|
||||
context 'returns libjvm path' do
|
||||
context 'on Linux' do
|
||||
it do
|
||||
Facter.value(:java_libjvm_path).should == "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server"
|
||||
expect(Facter.value(:java_libjvm_path)).to eql "/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
@@ -36,7 +36,7 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
|
||||
EOS
|
||||
Facter::Util::Resolution.expects(:exec).with("/usr/libexec/java_home --failfast 2>&1").returns("/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home")
|
||||
Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
|
||||
Facter.value(:java_version).should == "1.7.0_71"
|
||||
expect(Facter.value(:java_version)).to eql "1.7.0_71"
|
||||
end
|
||||
end
|
||||
context 'on other systems' do
|
||||
@@ -74,7 +74,7 @@ Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
|
||||
let(:facts) { {:operatingsystem => 'Darwin'} }
|
||||
it do
|
||||
Facter::Util::Resolution.expects(:exec).at_least(1).with("/usr/libexec/java_home --failfast 2>&1").returns('Unable to find any JVMs matching version "(null)".')
|
||||
Facter.value(:java_version).should be_nil
|
||||
expect(Facter.value(:java_version)).to be_nil
|
||||
end
|
||||
end
|
||||
context 'on other systems' do
|
||||
|
||||
Reference in New Issue
Block a user