Commit Graph

69 Commits

Author SHA1 Message Date
Jan Vansteenkiste
b5b03e5c00 (MODULES-4050) Check if jre is in the path before subsubdir 2016-11-07 16:06:36 +01:00
Hunter Haugen
06c3f9f112 Merge pull request #184 from ntpttr/fix/master/modules-2971
(MODULES-2971) Add java_home to all operating systems
2016-10-17 10:54:06 -07:00
Nate Potter
9df2f3d2a6 Change exec to file_line
This commit updates the setting of JAVA_HOME in /etc/environment
to be done with file_line rather than exec.
2016-10-14 09:10:53 -07:00
Eric Putnam
bd25f7a58a ci fix for install_spec 2016-10-13 14:20:20 -07:00
Nate Potter
eb587a433e Change file resource to exec
This commit changes the way the JAVA_HOME variable is added to
/etc/environment from using a file resource to using an exec
resource. This way we can avoid resource conflicts with the
file.

Signed-off-by: Nate Potter <ntpttr@gmail.com>
2016-09-17 11:58:58 -07:00
Jinn Koriech
0c9aafe52c Test cases for oracle-java8-(jre|jdk)
New versions of oracle java 8 >= 100 have an updated naming scheme.  These
test cases validate the new conditional logic around this for Debian and
derivatives.
2016-09-08 16:12:24 +01:00
David Schmitt
f8a897c5cf Update modulesync_config [a3fe424] 2016-08-26 18:42:08 +02:00
Nate Potter
dd8f85a2fa (MODULES-2971) Add java_home to all operating systems
This patch adds the java_home variable to all supported
operating systemd, and gives the user the option to
set it themselves. It also updates config.pp to
ensure that the JAVA_HOME variable is set to
the desired java_home.
2016-07-16 21:32:26 -07:00
Tyler Langlois
4b5cbc4d33 Update java package for SLES 11.4
As of SLES 11.4, Java 1.6 has been deprecated in favor of 1.7:
https://www.suse.com/releasenotes/x86_64/SLE-SDK/11-SP4/#fate-318121
2016-05-10 11:15:28 +01:00
David Schmitt
aafb208671 Update to newest modulesync_configs [9ca280f] 2016-04-18 20:15:09 +01:00
David Schmitt
de4dfde37a Merge pull request #168 from tphoney/fix_strict_vars
(maint) fix test to run under strict variables
2016-04-13 09:55:23 +01:00
tphoney
b9a864e313 (maint) fix test to run under strict variables 2016-04-13 06:55:17 +01:00
Alex Harvey
4775718a2f Fix up rspec deprecation warnings. 2016-04-12 22:52:51 +10:00
Hunter Haugen
749a735559 Merge pull request #159 from mmarseglia/master
Add support for official Oracle Java SE jdk and jre packages for CentOS
2016-03-02 10:08:57 -08:00
Joseph Yaworski
c8e46b5db2 Use java 8 as the default on RHEL > 7.0 2016-02-24 13:38:06 -05:00
Marseglia. Mike
06aecdb62a Add support for official Oracle Java SE jdk and jre packages for CentOS 2016-02-18 14:15:19 -05: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
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
David Schmitt
3b8bba05ca (FM-4049) Update to current msync configs [2c99161] 2016-01-27 14:35:45 +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
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
Jan Vansteenkiste
8bef423733 Fix rspec deprecation warnings. .should -> expect().to 2015-09-29 06:44:30 +02:00
Hunter Haugen
ec66670995 Add helper to install puppet/pe/puppet-agent 2015-06-11 16:54:34 -07:00
Justin Stoller
ba817d0d56 (maint) allow setting PUPPET_VESION in acceptance 2015-06-08 22:16:59 -07:00
Jonathan Tripathy
232258f290 Updated travisci file to remove allow_failures on Puppet 4 2015-06-08 14:24:41 +01:00
Sebastian Reitenbach
5815242f8e Add support for OpenBSD, and also add some regression tests.
Add info about OpenBSD support to README.md and metadata.json
Add a note about OpenBSD java_version fact to README.markdown.
Fixup wording on context in one of the java patch level regression tests.
No mentioning of OpenBSD in metdata.json

Cleanup wording of context as suggested by @elyscape
update contexts as suggested by @elyscape
2015-04-23 12:29:11 +02:00
Lutz Behnke
e22aa3a36a add support for ubuntu vivid (15.04) using openjdk-8
add acceptance test node without really understanding what it does.
add test for distribution type jdk for Ubuntu vivid
2015-04-01 08:16:07 +02:00
Colleen Murphy
5b45d1fede Update rspec tests for rspec-puppet 2
This patch uses `catalogue` instead of `subject` for the raise_error
matcher since `subject` is not evaluated the way it used to be. We also
unpin rspec-puppet.
2015-03-19 14:09:58 -07:00
Eli Young
8dd715a599 Improve java_version fact maintainability 2015-02-09 15:26:53 -08:00
Morgan Haskel
97b48f12d1 Merge pull request #104 from cottsay/master
Fix Fedora 21+ package name
2015-02-06 18:46:22 +01:00
Oliver Falk
79805000cc (MODULES-1749) Update java_version fact...
with maximum memory size

Add -Xmx8m to make large systems happy.
2015-02-06 12:47:23 +00:00
Scott K Logan
98447f03e7 Fix Fedora 21+ package name
java-1.7.0-openjdk is no longer available in Fedora 21+
2015-01-31 22:50:06 -08:00
Hunter Haugen
b138633c4e Merge pull request #92 from petems/MODULES-1570-java_version_facts
MODULES-1570 Java Version facts
2015-01-08 09:03:53 -08:00
Peter Souter
46524ee6eb (MODULES-1570) Stub exec for older Facter
Otherwise this spec will fail with

```
Mocha::ExpectationError:
unexpected invocation: Facter::Util::Resolution.which('uname')
```
2015-01-08 08:27:56 -08:00
Peter Souter
cd3ac1ee46 (MODULES-1570) Add java_major_version fact
Gives the major version of the Java release (ie. Java 1.7.0_71, major version is 7)

We also want to specifically return nil when java not present
2015-01-07 15:42:23 -08:00
Richard Pijnenburg
3b290abddf Use --jre-headless instead of --jre
In some cases it can cause problems and report these kind of errors:

$ update-java-alternatives -s /usr/lib/jvm/java-1.7.0-openjdk-amd64 --jre
update-alternatives: error: no alternatives for policytool
update-alternatives: error: no alternatives for policytool
2015-01-07 22:51:26 +00:00
Morgan Haskel
619cdf99c4 Acceptance test fix for wheezy 2014-12-29 17:13:06 -08:00
Morgan Haskel
ee9d955eeb Test fix for RHEL with alternatives
Alternatives support was added in #89, but the test wasn't updated to
expect failures when invalid alternatives are passed to RHEL systems.
2014-12-29 09:53:03 -08:00
Peter Souter
378dcc7802 (MODULES-1570) TDD Style - Add specs first
Facter unit tests to check resolution of Java version
2014-12-29 15:13:47 +00:00
Travis Fields
16ec5a40a7 Merge pull request #93 from mhaskel/modulesync
Sync files with modulesync
2014-12-26 16:39:23 -08:00
rmenezes
0c2e8bb610 Add Java alternatives for RHEL based distros. 2014-12-26 15:10:37 -08:00
Morgan Haskel
c660622b82 Sync files with modulesync 2014-12-26 10:58:14 -08:00
Travis Fields
abad30de06 Update defaults for SLES
Fixed test issues with solaris-11 and added support for sles-12
2014-11-05 16:04:52 -08:00
Travis Fields
d1d1ec2327 Remove puppet_module_install in favor of copy_module_to 2014-09-10 11:30:52 -07:00
Hunter Haugen
fb38145cd4 Ah hah, got it 2014-08-28 18:33:56 -07:00
Hunter Haugen
4cf0088f91 Maybe spec filters work like this 2014-08-28 18:21:09 -07:00
Hunter Haugen
30a5311d73 Spec typo 2014-08-28 17:53:11 -07:00
Hunter Haugen
096196bd89 Remove Sci 7 from readme and update oracle linux tests for ubuntu 2014-08-28 16:38:23 -07:00