Commit Graph

376 Commits

Author SHA1 Message Date
Hunter Haugen
c7830db74e (MODULES-4098) Sync the rest of the files 2017-01-20 10:59:09 -08:00
Eric Putnam
ea3fbbf99f Merge pull request #210 from puppetlabs/hunner_msync
(MODULES-4097) Sync travis.yml
2017-01-17 14:17:37 -08:00
Eric Putnam
e36f6ce760 Merge pull request #211 from puppetlabs/implement-beaker-module_install_helper
[MODULES-4224] Implement beaker-module_install_helper
2017-01-11 13:40:24 -05:00
Hunter Haugen
2604fcf5fb (MODULES-4097) Sync travis.yml 2017-01-10 14:13:55 -08: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
TP Honey
866eae1393 Merge pull request #209 from hedzr/master
add 'Amazon Linux AMI' supports
2016-12-23 11:41:16 +00:00
Tyler Langlois
70b6b81ec9 Update SLES 11sp4 packages to Java 1.7.1 (#178) 2016-12-23 11:36:22 +00:00
Hunter Haugen
37e799a35c Merge pull request #208 from puppetlabs/modsync
(FM-5972) gettext and spec.opts
2016-12-14 22:57:41 -08:00
hedzr
9de6384cb1 Merge pull request #1 from hedzr/hedzr-patch-add-amazon-linux-ami-supports
for 'Amazon Linux AMI' supports
2016-12-15 11:13:40 +08:00
hedzr
c2420550c6 for 'Amazon Linux AMI' supports
[Amazon Linux AMI](https://aws.amazon.com/cn/amazon-linux-ami/2016.09-release-notes/) is another RedHat-like os image, openjdk-7 was shipped in that image but we  want more choices or jdk 8. i'd been tested ok for oracle jdk installation on a 't2.micro' instance.
2016-12-15 11:08:55 +08:00
Eric Putnam
e17aa2c65c gettext and spec.opts 2016-12-14 15:08:55 -08:00
Eric Putnam
0b47353d81 Merge pull request #207 from puppetlabs/hunner_msync
(MODULES-3631) msync Gemfile for 1.9 frozen strings
2016-12-07 21:52:18 -08:00
TP Honey
66671ccf76 Merge pull request #206 from DavidS/move-to-examples
Designate former tests files as examples
2016-12-02 12:57:35 +00:00
Hunter Haugen
d39b0d5d1a (MODULES-3631) msync Gemfile for 1.9 frozen strings 2016-12-01 11:37:46 -08:00
David Schmitt
aa62b1816e Designate former tests files as examples 2016-12-01 17:50:03 +00:00
Eric Putnam
9ce23de1c2 Merge pull request #188 from MiamiOH/archive_proxy_server
Add proxy options for Oracle Java
2016-11-28 16:15:21 -08:00
Eric Putnam
ae4ab7736c Merge pull request #191 from bodik/lsbdistcodename-stretch
support java on debian stretch
2016-11-28 15:47:38 -08:00
David Schmitt
08ace70cb3 Merge pull request #205 from eputnam/MODULES-4081
(MODULES-4081) uses /etc/profile for solaris
2016-11-23 19:23:09 +00:00
Eric Putnam
efb9823d3c uses /etc/profile/ for solaris 2016-11-23 10:58:16 -08:00
Eric Putnam
d27b0af5a9 Merge pull request #204 from puppetlabs/hunner_msync
(MODULES-3704) Update gemfile template to be identical
2016-11-10 14:43:38 -08:00
Wilson McCoubrey
658be7b4f2 Merge pull request #202 from vrtdev/bugfix/fact_java_default_home
MODULES-4050: Check if jre is in the path before subsubdir.
2016-11-10 16:00:38 +00:00
Hunter Haugen
cf077aa16e (MODULES-3704) Update gemfile template to be identical 2016-11-09 12:01:49 -08:00
Hunter Haugen
b94fb4a044 Merge pull request #201 from puppetlabs/modulesync_stuff
mocha version update
2016-11-07 13:29:31 -08:00
Jan Vansteenkiste
b5b03e5c00 (MODULES-4050) Check if jre is in the path before subsubdir 2016-11-07 16:06:36 +01:00
Chris Edester
25c1ac83ce Add proxy options for Oracle Java 2016-11-03 13:32:01 -04:00
Wilson McCoubrey
91871b1408 Merge pull request #200 from MiamiOH/archive_creates
java::oracle Do not download archive if already installed
2016-11-03 17:16:18 +00:00
Eric Putnam
1dd62ddc33 mocha version update 2016-11-02 16:10:17 -07:00
Chris Edester
693d980c2b java::oracle Do not download archive if already installed
We are having issues on reboot of boxes. It tries to download to tmp even though already installed, which would be fine,
but the version is no longer available.
This results in curl downloading something to tmp every time puppet runs, which eventualy fills up tmp :(
2016-11-01 12:53:46 -04:00
Hunter Haugen
daddd9a115 Merge pull request #198 from puppetlabs/Paula_modulesync
(MODULES-3983) Update parallel_tests for ruby 2.0.0
2016-10-31 09:53:24 -07:00
Paula McMaw
e1b4cb5276 (MODULES-3983) Update parallel_tests for ruby 2.0.0 2016-10-20 09:47:55 +01:00
Hunter Haugen
b1f910d764 Merge pull request #196 from gzurowski/fix-docs
Fix naming of version_major and version_minor parameters
2016-10-19 10:46:55 -07:00
Gregor Zurowski
2fe6ff23b3 Fix naming of version_major and version_minor parameters in documentation.
Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
2016-10-18 16:10:56 +02: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
Hunter Haugen
fec59be2b7 Merge pull request #195 from eputnam/sles10_test_failure
(maint) ci fix for install_spec
2016-10-13 16:05:14 -07:00
Eric Putnam
bd25f7a58a ci fix for install_spec 2016-10-13 14:20:20 -07:00
Eric Putnam
f9d152e991 Merge pull request #194 from puppetlabs/modulesync
Update modulesync_config [51f469d]
2016-10-11 22:07:57 -07:00
Hunter Haugen
8852a13a11 Merge pull request #193 from gzurowski/oracle-java-specific-versions-docs
Update documentation about parameters major_version and minor_version
2016-10-10 13:48:34 -07:00
David Schmitt
6f2d6057a8 Update modulesync_config [51f469d] 2016-10-10 14:25:47 +01:00
Gregor Zurowski
3a13507a67 Update documentation about parameters major_version and minor_version
Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
2016-10-08 19:16:25 +02:00
Gregor Zurowski
2a8236e6d1 Allow targeting specific major/minor Oracle JDK versions (#192)
* Allow targeting specific major/minor Oracle JDK versions

Expose two new parameters 'version_major' and 'version_minor' to
allow users targeting specific Oracle JDK versions.

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>

* Fix lint validation issues

Signed-off-by: Gregor Zurowski <gregor@zurowski.org>
2016-10-07 19:48:58 +02:00
ntpttr
9093da3b32 Update config.pp 2016-09-20 14:05:18 -07:00
ntpttr
3960227e60 Add unless clause to exec 2016-09-20 13:53:03 -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
Eric Putnam
2b0bd48cb5 Merge pull request #187 from alphagov/master
thanks!
Support recent java versions > 8u99 built with make-jpkg 0.53
2016-09-08 12:47:04 -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
Jinn Koriech
feb669f203 Support recent java versions > 8u99 built with make-jpkg 0.53
The previous make-jpkg from java-package_0.50 doesn't support building java
versions with three digits in the release number.  Therefore it has been
necessary to upgrade java-packaages to the newer 0.53 version.

Building oracle packages using the java-package tools 0.53 results in package
with a new naming scheme as compared to 0.50.  In particular where the packages
were previously named oracle-j2re1.8 they are now named oracle-java8-jre, while
oracle-j2dk1.8 has become oracle-java8-jdk.  The alternatives naming has also
changed.

We also need to handle the system architecture naming on debian systems where
Debian names it's 64bit architecture 'amd64' and Oracle use 'x64'.  This results
in the java_home path using x64 rather than amd64.  We need to handle this
variation while also accommodating all architectures, and only for the recent
packages.

Given this has only been tested on Ubuntu, and the make-jpkg tooling is managed
in the Debian flavour, the changes are only applied to that code branch.

Jinn Koriech & Doug Neal
2016-09-08 15:43:38 +01:00
root
d30954ebc4 support java on debian stretch 2016-09-07 20:16:31 +02:00
Eric Putnam
a39d5dbafa Merge pull request #190 from puppetlabs/modulesync
Update modulesync_config [a3fe424]
2016-08-26 13:55:43 -07:00
David Schmitt
f8a897c5cf Update modulesync_config [a3fe424] 2016-08-26 18:42:08 +02:00