Commit Graph

284 Commits

Author SHA1 Message Date
Joseph Yaworski
c8e46b5db2 Use java 8 as the default on RHEL > 7.0 2016-02-24 13:38:06 -05:00
Helen
a2e4898550 Merge pull request #158 from DavidS/debian-8-support
Update metadata to note Debian 8 support
2016-02-17 12:15:10 +00:00
David Schmitt
1c3dd32c81 Update metadata to note Debian 8 support 2016-02-17 11:58:14 +00:00
TP Honey
7b073c5ef6 Merge pull request #157 from DavidS/fm-4046-update-msync
(FM-4046) Update to current msync configs [006831f]
2016-02-16 17:04:40 +00:00
David Schmitt
7f4f864dfc (FM-4046) Update to current msync configs [006831f]
This moves all copyright statements to the NOTICE file in accordance with the ASFs guidelines on applying the Apache-2.0 license.
2016-02-16 16:33:34 +00:00
Bryan Jen
9a0fc641f9 Merge pull request #156 from joerayme/allow-tildes-in-version
Allow tildes in version to support webupd8team's packages
2016-02-08 09:09:10 -07:00
Joe Ray
e6a026d3c8 Merge branch 'master' into allow-tildes-in-version 2016-02-05 15:23:03 +00:00
Joe Ray
3bb3f325b7 Allow tildes in version to support webupd8team's packages
See http://ppa.launchpad.net/webupd8team/java/ubuntu/pool/main/o/oracle-java8-installer/
2016-02-05 15:05:19 +00:00
TP Honey
5152c9c25e Merge pull request #151 from tux-o-matic/master
Can now pass options to package provider
2016-01-29 13:39:13 +00:00
Benjamin Merot
3842d6f657 Added possibility to pass options to package
Exposed the Puppet 'package' resource's 'install_options' parameter via a new class parameter names 'package_options*. It takes an array of strings to pass installation options to the package provider of the targer OS (yum, apt-get, ...)

Added validation of $package_options array

Using stdlib' validate_array function to ensure that $package_options is a valid array (also if just empty).

Cleaned array validation line

Made $package_options undef by default

Class parameter $package_options is now set to undef by default, validation is done in the class to ensure only an array would be passed to it if set.

Added case for 'package_options' parameter

Will test the use of the 'package_options' parameter being passed the YUM option --downloadonly which will see YUM return 0 but package will not be installed on system.

Simplified test of 'package_options' parameter

As the test 'select openjdk for Fedora 21 without installing' expects with a successful YUM run but the 'java' package not present, specifying package version is irrelevant.

New case for complete installation with YUM option

Added new case using 'package_options' with a a YUM option expected to not prevent rpm installation.
Also added distribution parameter for test of 'pacakge_options' with yum option expected to prevent package installation.

Removed validation of package name

Removed validation of package name as it is not meant to be testing by 'select passed value for Fedora 21 with yum option'

Removed test with '--downloadonly'

The test of 'package_options* with the YUM option '---downloadonly' can't seem to be validate in CI.
Other test 'select passed value for Fedora 21 with yum option' covers passing a value to 'package_options* and passes test in CI.
2016-01-29 10:57:24 +01:00
Hunter Haugen
d69eedd7e2 Merge pull request #154 from DavidS/fm-4049-update-msync
(FM-4049) update to modulesync_configs
2016-01-27 08:36:38 -08:00
David Schmitt
3b8bba05ca (FM-4049) Update to current msync configs [2c99161] 2016-01-27 14:35:45 +00:00
TP Honey
aee0f6bc3f Merge pull request #153 from petems/MODULES-2928-add_freebsd_support
(MODULES-2928) Adds FreeBSD Support
2015-12-29 14:46:32 +00:00
Peter Souter
f1f2b830a0 (MODULES-2928) Adds FreeBSD Support
* Note this won't work by default on FreeBSD Puppet < 4.0, as pkgng is not the default provider 
* On older Puppet, use `zleslie/pkgng`, on newer it's the default package provider.
2015-12-29 13:11:47 +00:00
Bryan Jen
59a24e9eaf Merge pull request #152 from thomasodus/master
Added support for oracle-j2re1.8 and oracle-j2sdk1.8
2015-12-22 15:46:40 -07:00
thomas odukogbe
3a7ed12d49 Added support for oracle-j2re1.8 and oracle-j2sdk1.8 2015-12-21 11:27:45 +00:00
Helen Campbell
5b6470acf6 Merge remote-tracking branch 'upstream/1.4.x' 2015-12-08 16:23:35 +00:00
David Schmitt
4764484970 Merge pull request #117 from ccin2p3/f/libjvm_fact
add two facts: libjvm and java executable paths
2015-12-01 13:19:21 +00:00
Fabien Wernli
9c154890a3 add two facts: java_libjvm_path java_default_home
* dirname containing base directory of java
* e.g. java binary is `${::java_default_home}/jre/bin/java`

* dirname containing `libjvm.so`
* Most people will use this for LD_LIBRARY_PATH
2015-12-01 12:13:11 +01:00
Bryan Jen
a65d69a85d Merge pull request #148 from tphoney/release_1.4.3
1.4.3 release prep
1.4.3
2015-11-24 17:59:19 -07:00
tphoney
1c1d0b6cb7 1.4.3 release prep 2015-11-24 15:26:35 +00:00
Bryan Jen
4f0ee5a759 Merge pull request #147 from oc243/patch-2
Add support for Ubuntu 15.10
2015-11-20 09:34:33 -07:00
Oliver Chick
ca2171043e Add support for Ubuntu 15.10 2015-11-18 23:52:17 +00:00
David Schmitt
1236d9ee47 Merge pull request #145 from bmjen/git-fixtures
update fixtures.yml to use git instead of http
2015-10-15 17:39:46 +01:00
Bryan Jen
de05057e1d update fixtures.yml to use git instead of http 2015-10-15 09:37:37 -07:00
Hunter Haugen
faede8c802 Fix fixtures 1.4.2 2015-10-06 18:08:48 -07:00
JT (Jonny)
a9198d235d Merge pull request #144 from hunner/release_1.4.2
Release 1.4.2
2015-10-07 01:30:20 +01:00
Hunter Haugen
c47711e36e Release 1.4.2 2015-10-06 16:29:23 -07:00
Jesse Lovelace
65476bd54b Merge pull request #143 from puppetlabs/master
Update 1.4.x with master changes
2015-10-06 18:20:34 -05:00
Hunter Haugen
8eee08c143 Merge pull request #142 from DavidS/MODULES-2637-java_version_on_OSX
(MODULES-2637) Checks java actually installed
2015-10-01 11:20:49 -07:00
David Schmitt
dadc7a6c22 (MODULES-2637) Checks java actually installed
The other method for running which java doesn't work on OSX, as java is installed as an empty shim when not installed in the base OSX image:

```
vagrant:~ vagrant$ java
No Java runtime present, requesting install.
vagrant:~ vagrant$ /usr/libexec/java_home --failfast
Unable to find any JVMs matching version "(null)".
vagrant:~ vagrant$
```

We can use the `/usr/libexec/java_home --failfast` command to check if
java is actually present first.

Originally-by: Peter Souter <peter.souter@puppetlabs.com>
2015-10-01 19:09:32 +01:00
David Schmitt
3645364e5b (MAINT) declare an exclusion filter for the tests using with_env on facter 1.6
The with_env function is not available in facter 1.6 and OpenBSD is not
supported.
2015-10-01 19:09:32 +01:00
Hunter Haugen
913a810bfd Merge pull request #141 from vrtdev/feature/fix_spec_deprecation_warnings
Fix rspec deprecation warnings. .should -> expect().to
2015-09-28 21:47:57 -07:00
Jan Vansteenkiste
8bef423733 Fix rspec deprecation warnings. .should -> expect().to 2015-09-29 06:44:30 +02:00
Bryan Jen
abd490dc6a Merge pull request #137 from puppetlabs/1.4.x
mergeback 1.4.x
2015-07-15 15:39:00 -07:00
Bryan Jen
7c70ceaed7 Merge pull request #136 from hunner/release_1.4.1
Release 1.4.1
1.4.1
2015-07-15 13:33:32 -07:00
Hunter Haugen
76c5d2c93d Release 1.4.1 2015-07-15 13:14:56 -07:00
Hunter Haugen
8e5b079fd7 Merge pull request #135 from zreichert/fix
Add OEL operatingsystem to java::params
2015-07-14 10:06:44 -07:00
Zach Reichert
e8b3dd534f Add OEL operatingsystem to java::params 2015-07-14 10:03:56 -07:00
Hunter Haugen
9efcb78c1f Merge pull request #134 from mhaskel/merge_1.4.x_to_master
Merge 1.4.x to master
2015-07-09 14:57:39 -07:00
Morgan Haskel
d07a3551c7 Merge pull request #133 from hunner/fix_metadata
Fix incorrect metadata
1.4.0
2015-07-07 10:12:18 -07:00
Hunter Haugen
911b497725 Fix incorrect metadata 2015-07-07 10:11:36 -07:00
Morgan Haskel
9e85843369 Merge pull request #132 from bmjen/1.4.0-prep
updates metadata.json to include support for PE up to 2015.2.x
2015-07-06 16:34:35 -07:00
Bryan Jen
b04fbac5af updates metadata.json to include support for PE up to 2015.2.x 2015-07-06 16:33:22 -07:00
Morgan Haskel
17dfb850db Merge pull request #131 from bmjen/1.4.0-prep
Release 1.4.0 prep
2015-07-06 13:27:40 -07:00
Bryan Jen
b058ce725c Release 1.4.0 prep 2015-07-06 13:17:27 -07:00
Bryan Jen
cf0c56b06f Merge pull request #126 from danielparks/require-update-java-alternatives
Install update-java-alternatives on Debian for the java::config class
2015-07-02 12:27:05 -07:00
Morgan Haskel
3a102bcde4 Merge pull request #129 from bmjen/fedora-support
(MODULES-2068) add fedora to metadata.json operatingsystem_support list
2015-07-01 16:43:13 -07:00
Joshua Hoblitt
907e727ad1 (MODULES-2068) add fedora to metadata.json operatingsystem_support list 2015-07-01 15:43:22 -07:00
Travis Fields
14cf5c4e5d Merge pull request #128 from bmjen/oracle-fun
(MODULES-2095) fixes create-java-alternatives command
2015-06-30 09:46:26 -07:00