Commit Graph

96 Commits

Author SHA1 Message Date
tphoney
e53b8bb563 FM-6634 rubocop fixes 2017-12-06 15:47:27 +00:00
Will Meek
dec5136e11 Cleanup ruby code via rubocop
This commit will add code cleanup as corrected
and alerted by rubocop. It also adds rules to
execute rubocop on Travis.
2017-11-21 14:31:45 +00:00
Paula McMaw
7a271eef3e Module sync 1d81b6a (#267) 2017-11-17 15:32:24 +00:00
Will Meek
e1df6498c7 Fix facter unit test when using realpath 2017-11-15 14:37:42 +00:00
Sebastian Reitenbach
e50eb64614 do not use unportable readlink utility to find the java_default_home,
use Ruby in a more portable fashion.

adapt tests as well
2017-11-15 14:37:42 +00:00
Michael Baker
db30eb9e2d Adding support for Ubuntu (#243)
* Translate amd64

* Fix the path creation on exec
2017-11-15 14:36:10 +00:00
TP Honey
5f820fe8bd Merge pull request #257 from shuebnersr/fact1754_java_version_fails_when_JAVA_TOOL_OPTIONS_is_used
(FACT-1754) search for matching line with java version
2017-10-02 12:41:05 +01:00
shuebnersr
b7bdf96252 Fixed search for matching line with java version
Use value of variable instead of return statement
Extended unit test for checking handling of JAVA_TOOL_OPTIONS
2017-10-01 15:15:01 +02:00
TP Honey
231db77fe7 Merge pull request #203 from vrtdev/bugfix/override_package_alt_home
#MODULES-4069: Fail when required params are not available in params.
2017-09-26 14:02:45 +01:00
Jan Vansteenkiste
c40b061d97 (MODULES-4069) Fail when required params are not available in params.
When overriding all values required for the java setup, there is
no need to fail if params.pp does not support the package.
2017-09-26 07:37:41 +02:00
shuebnersr
578eb951ea fix java_version test for other systems
mock Facter::Util::Resolution.which('java') for the "other systems" test; before it was not mocked and was based on Java being installed on the test system or not
2017-09-22 11:50:41 +02:00
Hunter Haugen
8458b03bb5 (maint) Add url_hash tests 2017-06-20 16:22:10 -07:00
Paula McMaw
a09bc3aa52 Merge pull request #236 from HelenCampbell/adddocsfix
MODULES-5047 - Update java::oracle class to work with new download URLs
2017-06-13 15:15:59 +01:00
Michael Watters
08423fb170 MODULES-5047 - Update java::oracle class to work with new download URLs
Oracle appears to have changed the JDK URL structure starting with Java 8u121.
This update adds a hash to store the values used by Oracle's java download site
along with a case statement to lookup the proper key for the java release being
installed.
2017-06-13 14:57:18 +01:00
Eric Putnam
da3e40903d Merge pull request #235 from hunner/fix_rhel7_home
(maint) Update java_home for redhat 7
2017-06-12 15:13:16 -07:00
Hunter Haugen
e234375924 (maint) Update java_home for redhat systems
It appears that redhat 7 and variants no longer have
java-1.7.0-openjdk-$arch symlinks. All redhat 6/7's both 32 and 64 bit
seem to include a java-1.7.0 symlink though.
2017-06-12 14:54:22 -07:00
Stefan Pijnappels
05b9d1c2ba MODULES-5058 Allow a complete URL to be passed to the java::oracle class
This provides a workaround  to the issue of Oracle changing it's URL structure which breaks the dynamic URL building in the module.
It allows a complete URL to be passed as an alternative to one built by the logic in the module, and allows the rest of the module to function as expected when this situation is encountered.

Changes made to manifests/oracle.pp to pass URL in `url` parameter (if defined) to the `source` directive of the archive resource which fetches the installer package.
README.markdown has been updated to document the additional parameter, as well as a note added to known issues describing it's operation.
A test has been added to spec/defines/oracle_spec.rb to verify the correct package is present in the tmp archive location. The spec tests have passed and the revised workflow has been tested in a lab environment and found to be working.
2017-06-08 10:29:58 +01:00
Hunter Haugen
49369bd48c Merge pull request #215 from vrtdev/bugfix/MODULES-4368-java_default_home-invalid-fact
See: https://tickets.puppetlabs.com/browse/MODULES-4368
2017-06-07 16:15:47 -07:00
Eric Putnam
7f843d4b5b (maint) facts update oracle.pp
puppet-archive, a puppetlabs-java dependency, is now using structured
facts on master. this commit changes the minimum number of facts from
legacy to structured so that spec tests continue to pass
2017-05-30 13:54:03 -07:00
Hailey Martin
b25212a04e Update OpenJDK packages to 1.8.0 for SLES 12 service packs 2017-05-15 20:37:26 +10:00
Bryan Stopp
b266755711 (MODULES-4751) Fix Archive Order of Operations
Without this patch the Oracle based package installations fail due to missing dependency: the package. The package installation command is defined and applied before the archive resource downloads the remote file. This patch correctly applies the order of operations: download package, install package.
2017-04-20 14:17:49 -05:00
Vadym Chepkov
797677caf7 [MODULES-4736] Increase Xmx setting for java_version fact
Previous value of 8M caused JVM to crash on servers with more then 40G of RAM
Tested on databases servers up to 1.5T of RAM, 12M seems to be sufficient
2017-04-19 07:47:07 -04:00
Steve Traylen
580d875b9a Support SLC operatingsystem
Scientific Linux CERN has a facter operatingsystem
value of SLC. Other than that identical to SL.
2017-03-10 16:52:19 +01:00
Jan Vansteenkiste
20960ddb7f MODULES-4368: Add a test case for the issue 2017-02-01 08:10:15 +01:00
Wilson McCoubrey
378f0b7fcc [MODULES-4224] Implement beaker-module_install_helper
Gemfile updated by modulesync PR: puppetlabs/modulesync_configs#122
2017-01-10 12:08:21 +00:00
Tyler Langlois
70b6b81ec9 Update SLES 11sp4 packages to Java 1.7.1 (#178) 2016-12-23 11:36:22 +00:00
Eric Putnam
e17aa2c65c gettext and spec.opts 2016-12-14 15:08:55 -08:00
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