Compare commits

...

612 Commits

Author SHA1 Message Date
Lukas Audzevicius
cc3c5401a9 Merge pull request #513 from david22swan/maint/release_prep
Release prep v8.0.0
2022-04-05 15:08:51 +01:00
david22swan
8fe60c71be Release prep v8.0.0 2022-04-05 12:55:54 +01:00
Lukas Audzevicius
452cd836c3 Merge pull request #512 from puppetlabs/pdksync_pdksync-use_pull_request_target
pdksync - PDKSYNC Update labeller trigger
2022-04-04 15:31:15 +01:00
Craig Gumbley
8be3cb1e64 "This commit changes the workflow trigger for pull requests to pull_request_target" 2022-04-04 14:09:47 +01:00
Craig Gumbley
a5228d17b5 Merge pull request #507 from david22swan/GH-C&T-7/main/remove_compatible_code 2022-03-30 13:34:26 +01:00
david22swan
367d197278 (GH-C&T-9) Temporarily disable syntax checks 2022-03-30 13:06:41 +01:00
david22swan
d6bccd4097 (GH-C&T-7) Remove code specific to unsupported OSs
Removes compatibility for all Debian below 9, all Ubuntu below 18.04
2022-03-30 13:06:41 +01:00
Lukas Audzevicius
dd4eec27d6 Merge pull request #506 from puppetlabs/pdksync_pdksync_add_workflows
pdksync - Add labeller and stale GHA workflows
2022-03-25 16:11:18 +00:00
Craig Gumbley
a744c14662 (MAINT) Fixes no new line at EOF 2022-03-25 15:33:44 +00:00
Craig Gumbley
3c030d73d3 (MAINT) Add labeller and stale GHA workflows 2022-03-25 15:12:33 +00:00
Lukas Audzevicius
5eb468d2c2 Merge pull request #505 from puppetlabs/pdksync_GH-iac-334/main/remove_ubuntu_16.04_support
pdksync - (GH-iac-334) Remove Support for Ubuntu 14.04/16.04
2022-03-24 10:45:13 +00:00
david22swan
2b2e79ba5d (GH-iac-334) Remove Support for Ubuntu 14.04 2022-03-23 16:11:57 +00:00
david22swan
a98d0801d7 (GH-iac-334) Remove Support for Ubuntu 16.04 2022-03-23 12:34:20 +00:00
Lukas Audzevicius
ecd0f881c6 Merge pull request #504 from puppetlabs/pdksync_pdksync_heads/main-0-gf3911d3
pdksync - pdksync_heads/main-0-gf3911d3
2022-03-21 16:37:04 +00:00
david22swan
369219732b pdksync_heads/main-0-gf3911d3 2022-03-16 15:38:40 +00:00
david22swan
d36a0f6f12 Merge pull request #502 from dodevops/modules-11234
(MODULES-11234) Support Adoptium Temurin
2022-03-10 15:22:30 +00:00
Craig Gumbley
44bd9d5a21 Merge pull request #503 from puppetlabs/pdksync_IAC-1787/main/remove_centos_6_support
pdksync - (IAC-1787) Remove Support for CentOS 6
2022-02-08 15:54:40 +00:00
22swan
af04d1eba3 (IAC-1787) Remove Support for CentOS 6 2022-02-08 15:22:13 +00:00
Dennis Ploeger
3aac15caa7 (MODULES-11234) Support Adoptium Temurin 2021-12-03 09:39:11 +01:00
daianamezdrea
1e5d620e03 Merge pull request #501 from puppetlabs/release-prep
Release prep v7.3.0
2021-10-11 16:28:02 +03:00
GitHub Action
b0b9d9d035 Release prep v7.3.0 2021-10-11 13:24:57 +00:00
david22swan
1388863f4f pdksync - (IAC-1753) - Add Support for AlmaLinux 8 (#500)
* (IAC-1752) - Add Support for AlmaLinux 8

* Update params.pp

* Fix lint error

* Update params.pp

Co-authored-by: daianamezdrea <46529728+daianamezdrea@users.noreply.github.com>
Co-authored-by: daiana <daiana.mezdrea@yahoo.com>
2021-10-11 15:59:15 +03:00
carabasdaniel
8cad2cd4e4 Merge pull request #499 from puppetlabs/pdksync_IAC-1751/main/add_rocky_8_support
pdksync - (IAC-1751) - Add Support for Rocky 8
2021-09-29 15:29:35 +03:00
David Swan
d33cb0f51c (IAC-1751) - Add Support for Rocky 8 2021-09-28 10:32:52 +01:00
Adrian Iurca
feb38a7b9e Merge pull request #498 from puppetlabs/pdksync_IAC-1598/main/remove_debian_8_support
pdksync - (IAC-1598) - Remove Support for Debian 8
2021-09-23 12:05:54 +03:00
daianamezdrea
f7342bacb7 Merge pull request #497 from puppetlabs/release-prep
Release prep v7.2.0
2021-09-20 17:56:47 +03:00
GitHub Action
5b8b12525c Release prep v7.2.0 2021-09-20 14:21:34 +00:00
daianamezdrea
5531b7b728 Merge pull request #488 from pmjensen/main
Enabling Rocky Linux for Install
2021-09-20 17:18:22 +03:00
David Swan
745f0917a7 (IAC-1598) - Remove Support for Debian 8 2021-09-15 13:43:38 +01:00
Tim Meusel
ae3e12ed5e Merge pull request #493 from smortex/main
Allow archive 6.x
2021-09-06 11:11:07 +02:00
Romain Tartière
529a37ca4e Allow archive 6.x
A new major version of the archive module was released which add support
for new operating systems and drop support of legacy ones.
2021-08-26 06:47:13 -10:00
david22swan
04cccb09c8 Merge pull request #492 from puppetlabs/release-prep
Release prep v7.1.1
2021-08-26 10:18:07 +01:00
GitHub Action
8fdefc4c89 Release prep v7.1.1 2021-08-25 15:43:57 +00:00
daianamezdrea
980cc5cc03 Merge pull request #491 from puppetlabs/IAC-1741/main/stdlib_v8.0.0
(IAC-1741) Allow stdlib v8.0.0
2021-08-25 18:20:32 +03:00
david22swan
8a6d5038bb (IAC-1741) Allow stdlib v8.0.0 2021-08-25 11:30:09 +01:00
david22swan
541a7dc90a Merge pull request #490 from puppetlabs/release-prep
Release prep v7.1.0
2021-08-12 11:22:15 +01:00
GitHub Action
49ef4596d1 Release prep v7.1.0 2021-08-12 10:19:23 +00:00
daianamezdrea
4cabd802d7 Merge pull request #489 from puppetlabs/pdksync_IAC-1709/main/add_debian_11_support
pdksync - (IAC-1709) - Add Support for Debian 11
2021-08-09 12:57:33 +03:00
Adrian Iurca
13acbba4c8 add debian-11 to params.pp 2021-08-09 05:16:13 +03:00
David Swan
e943b8654c (IAC-1709) - Add Support for Debian 11 2021-08-04 15:42:27 +01:00
Peter Jensen
8817a44d62 Enabling Rocky Linux for Install 2021-07-29 15:57:09 -07:00
Adrian Iurca
a8e68cd210 Merge pull request #487 from puppetlabs/pdksync_iac-1149
pdksync - (maint) - Updating Contribution Guidelines
2021-07-21 13:11:59 +03:00
Paula Muir
4b58529ad5 (maint) Updating CONTRIBUTING guidelines 2021-07-20 15:28:53 +01:00
Michael T Lombardi (He/Him)
358884cbd7 Merge pull request #486 from puppetlabs/pdksync_pdkupdate
pdksync - (maint) PDKSync - PDK Update
2021-06-07 10:28:39 -05:00
Daniel Carabas
e9a1c62f0d (maint) pdksync - PDK Update 2021-06-07 13:07:20 +03:00
daianamezdrea
ee3ac2dbc5 Merge pull request #480 from puppetlabs/pdksync_pdk_update
pdksync - (maint) Running pdk update
2021-04-27 14:40:19 +03:00
Paula Muir
c0ce63019e (maint) Running a pdk update to consume latest pdk-template changes 2021-04-26 21:07:54 +01:00
daianamezdrea
e283a48afc Merge pull request #478 from puppetlabs/release-prep
Release prep v7.0.2
2021-04-26 12:35:25 +03:00
GitHub Action
1c64b30c5d Release prep v7.0.2 2021-04-26 08:48:51 +00:00
daianamezdrea
01fba18d37 Merge pull request #473 from cbobinec/add-url-parameter
Add url parameter for adoptopenjdk
2021-04-26 11:45:58 +03:00
daianamezdrea
bdf8c34b02 Merge pull request #477 from puppetlabs/release-prep
Release prep v7.0.1
2021-04-19 11:21:24 +03:00
GitHub Action
c76a66eb7e Release prep v7.0.1 2021-04-17 03:10:19 +00:00
David Schmitt
312f5469cb Merge pull request #476 from bastelfreak/archive
puppet/archive: allow 5.x
2021-04-16 12:53:58 +01:00
Tim Meusel
69e9ffb19e puppet/archive: allow 5.x 2021-04-16 13:13:21 +02:00
Disha-maker
2d9ff91e1c Merge pull request #475 from puppetlabs/pdksync-locales_remove
pdksync - (maint) - Remove Locales Folder
2021-04-08 10:26:25 +01:00
David Swan
57c94e86e3 (maint) - Removal of Locales Folder 2021-04-07 15:40:51 +01:00
daianamezdrea
d595362de6 Merge pull request #474 from puppetlabs/pdksync_releaseprepupdate
pdksync - PDK Update for auto release prep workflow
2021-04-05 10:58:28 +03:00
Daniel Carabas
56f3f10b1d PDK Update for release prep workflow 2021-04-02 14:19:37 +03:00
Cédric Bobinec
4e2217986e update documentation with puppet strings 2021-04-02 12:20:13 +02:00
Cédric Bobinec
7b8c7ba42f add url parameter for adoptopenjdk 2021-03-23 08:57:37 +01:00
Paula Muir
4fed9edddf Merge pull request #471 from puppetlabs/pdksync_pdkupdate
pdksync - PDK Update - Replace Travis and Appveyor with Github Actions
2021-03-15 20:21:48 +00:00
Daniel Carabas
a83c5a60bc Replace Travis and Appveyor with Github Actions 2021-03-15 18:45:24 +02:00
carabasdaniel
be4923629a Merge pull request #470 from puppetlabs/release
(maint) Release Merge back PR v7.0.0
2021-03-01 18:19:47 +02:00
sheenaajay
2fe0d5dff4 Merge pull request #469 from carabasdaniel/release_prep_v7.0.0
Release version v7.0.0
2021-03-01 16:08:50 +00:00
Auto-release
4ed5c8b966 Release version 7.0.0 2021-03-01 15:44:13 +00:00
daianamezdrea
be8320eafe Merge pull request #468 from puppetlabs/pdksync_maint/main/perform_pdk_update
pdksync - (MAINT) PDK update for GHA workflows + Litmus updates
2021-02-26 15:25:15 +02:00
Ciaran McCrisken
ee6eb4e4a1 (MAINT) pdk update 2021-02-25 16:14:52 +00:00
Paula Muir
91e86c1d11 Merge pull request #467 from puppetlabs/pdksync_maint/main/deprecate_sles11
pdksync - (MAINT) Remove SLES 11 support
2021-02-24 16:58:46 +00:00
Ciaran McCrisken
f5350ff75b (MAINT) Remove SLES 11 support 2021-02-24 16:23:56 +00:00
Paula Muir
28599c9752 Merge pull request #466 from puppetlabs/pdksync_maint/main/deprecate_rhel_5_family
pdksync - (MAINT) Remove RHEL 5 family support
2021-02-24 15:34:27 +00:00
Ciaran McCrisken
0547a5aef9 (MAINT) Remove RHEL 5 OS family support 2021-02-24 13:56:20 +00:00
Michael T Lombardi (He/Him)
32f4322ec6 Merge pull request #464 from puppetlabs/maint/main/update_dependencies
(maint) Update major dependencies prior to release
2021-02-22 19:40:50 -06:00
Paula Muir
8169c6684e (maint) Update major dependencies prior to release 2021-02-22 16:33:42 +00:00
David Schmitt
0ee1993b19 Merge pull request #463 from puppetlabs/pdksync_remove_puppet5
pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0
2021-02-18 09:21:05 +00:00
Paula Muir
2ee840b8fc Merge pull request #461 from rjd1/main
(MODULES-10935) - Switch legacy operatingsystem fact to modern kernel one
2021-02-17 09:21:19 +00:00
Ryan Dill
c3a5d55989 (MODULES-10935) - Update fact used on Darwin in java_version unit test 2021-02-16 20:39:24 -08:00
Daniel Carabas
f48ed2fbe9 Add auto_release.yml to sync.yml 2021-02-16 19:19:04 +02:00
Daniel Carabas
1abf0ac15c pdk update 2021-02-16 15:36:50 +02:00
Daniel Carabas
0d2dda5590 Update .sync.yml 2021-02-16 09:50:57 +02:00
Daniel Carabas
d871ee97c1 Bump minimal puppet version to 6.0.0 in metadata.json 2021-02-15 17:36:26 +02:00
Daniel Carabas
a78feaa17e Remove Puppet 5 testing 2021-02-15 17:20:03 +02:00
Ryan Dill
595dc6df93 (MODULES-10935) - Switch legacy operatingsystem fact to modern kernel 2021-02-08 03:28:11 -08:00
daianamezdrea
c03f5a0392 Merge pull request #460 from puppetlabs/pdksync_gha-updates
pdksync - Update gha templates
2021-01-27 11:34:29 +02:00
David Schmitt
dcdbec8565 (maint) Update github actions 2021-01-26 17:16:54 +00:00
sheenaajay
a83f32da35 Merge pull request #457 from puppetlabs/pdksync
Update to puppet-module-gems 1.0, pdk-templates and new rubocop
2021-01-04 13:24:01 +00:00
daianamezdrea
1a6de8e23f Merge pull request #459 from puppetlabs/release
Release mergeback v6.5.0
2020-12-17 11:21:51 +02:00
Adrian Iurca
57187de011 Merge pull request #458 from daianamezdrea/release
Release prep version 6.5.0
2020-12-17 10:23:12 +02:00
David Schmitt
f9d03a10ac Apply remaining rubocop fixes 2020-12-16 17:36:26 +00:00
Auto-release
58edff7fd0 Release version 6.5.0 2020-12-16 14:47:44 +00:00
David Schmitt
d3c3598349 Add all safe auto corrects 2020-12-16 13:44:18 +00:00
David Schmitt
fdbccc3435 Add the FrozenStrings magic comment 2020-12-16 13:44:14 +00:00
David Schmitt
1dda22762e Update to pdk-templates and puppet-module-gems 1.0.0 2020-12-16 13:44:06 +00:00
sanfrancrisko
4ee756a53c Merge pull request #456 from puppetlabs/pdksync_remove_el6_tests
pdksync - Remove EL6 testing from Travis
2020-12-07 17:20:23 +00:00
Daniel Carabas
3667063d07 Remove EL6 testing from Travis 2020-12-07 17:23:47 +02:00
sheenaajay
ee323980c7 Merge pull request #454 from puppetlabs/pdksync_bump_puppet7
pdksync - (feat) Add support for Puppet 7
2020-12-07 12:16:43 +00:00
Daiana_Mezdrea
6a8f03bb17 (feat) - Bump Puppet boundary 2020-12-03 16:34:12 +02:00
David Schmitt
4f17bb9937 Merge pull request #452 from puppetlabs/pdksync_maint/main/release_checks_7_config
pdksync - (maint) Add release_checks_7 config to provision.yaml
2020-11-26 08:42:05 +00:00
Ciaran McCrisken
f3bfd78279 (maint) Add release_checks_7 config to provision.yaml 2020-11-25 13:28:27 +00:00
carabasdaniel
4c3e026fc8 Merge pull request #449 from sheenaajay/removefile
(maint) remove old workflows
2020-11-25 12:17:05 +02:00
sheenaajay
29f7c890ed Merge pull request #451 from carabasdaniel/pdkupdate
PDK Update for GA workflows
2020-11-25 10:16:52 +00:00
Daniel Carabas
d9969df148 PDK Update for GA workflows 2020-11-24 15:27:17 +02:00
sheena
9210295606 (maint) remove old workflow 2020-11-23 09:50:01 +00:00
David Schmitt
43bd5e73af Merge pull request #446 from sheenaajay/cijava
(maint) add java module to ci
2020-11-19 15:17:36 +00:00
sheena
460daa1a80 (maint) add java module to ci 2020-11-18 15:31:15 +00:00
David Schmitt
6bcee4a5fd Merge pull request #447 from puppetlabs/pdksync_gitpod
pdksync - Update pdk-templates for gitpod and codespaces support
2020-11-18 12:56:35 +00:00
David Schmitt
6aea9f9833 Update pdk-templates for gitpod and codespaces support 2020-11-17 21:22:26 +00:00
david22swan
13d30c2e2d Merge pull request #445 from puppetlabs/release
(maint) Release version 6.4.0 mergeback
2020-11-10 09:12:04 +00:00
David Swan
8d1f9c50fc Release version 6.4.0 2020-11-09 14:38:58 +00:00
daianamezdrea
15b317e2ef Merge pull request #439 from david22swan/IAC-993
(IAC-993) - Removal of inappropriate terminology
2020-11-02 12:15:58 +02:00
Adrian Iurca
b0cb998506 Merge pull request #442 from kenyon/patch-1
README: add Ubuntu 20.04
2020-10-27 15:58:16 +02:00
Ciaran McCrisken
9ef2748ef3 (IAC-993) - Removal of inappropriate terminology 2020-10-26 10:26:16 +00:00
sanfrancrisko
3358b47dc7 Merge pull request #443 from daianamezdrea/main
[IAC-1208] - Add the good links for solving the 404 error and exclude sles
2020-10-26 10:18:35 +00:00
Daiana_Mezdrea
f90756d87c Add the good links for solving the 404 error and exclude sles 2020-10-23 14:33:40 +03:00
Kenyon Ralph
82bf74b42a README: add Ubuntu 20.04
Ubuntu 20.04 support was added in #428.
2020-10-22 12:02:15 -07:00
Paula Muir
11dc1f4c26 Merge pull request #435 from puppetlabs/pdksync_IAC-973-2
pdksync - (IAC-973) - Update travis/appveyor to run on new default branch `main`
2020-08-06 12:31:13 +01:00
David Swan
d26dc21d11 (IAC-973) - Update travis/appveyor to run on new default branch main 2020-08-04 15:42:38 +01:00
daianamezdrea
f991317131 Merge pull request #433 from timdeluxe/sapjava
Support SAP Javas (sapjvm / sapmachine)
2020-07-15 17:38:33 +03:00
timdeluxe
24ca4a662a Support SAP Javas (sapjvm / sapmachine) 2020-07-14 17:33:55 +02:00
daianamezdrea
cb1632ab17 Merge pull request #432 from puppetlabs/pdksync_IAC-890
pdksync - (IAC-890) - Implement CentOS 8 travis tests
2020-06-18 16:22:37 +03:00
David Swan
875d5c4205 (IAC-890) - Implement CentOS 8 travis tests 2020-06-16 16:24:49 +01:00
david22swan
5730588e55 Merge pull request #431 from puppetlabs/pdksync_maint/iac-886
pdksync - (IAC-886) Back out SLES 11 from release checks
2020-06-15 10:12:19 +01:00
Ciaran McCrisken
cf2ce99452 (IAC-886) Remove SLES 11 from release checks 2020-06-12 16:33:38 +01:00
david22swan
a38ae55c7f Merge pull request #430 from puppetlabs/release
Release merge-back version 6.3.0
2020-05-28 09:37:38 +01:00
David Swan
372b5d939a Release version 6.3.0 2020-05-27 15:46:26 +01:00
Paula Muir
c481a128da Merge pull request #429 from markt-de/adopt_symlink
(MODULES-10681) Add option to manage symlink to java::adopt
2020-05-27 13:52:34 +01:00
Frank Wall
06f1a56b31 (MODULES-10681) Add option to manage symlink to java::adopt
While here, convert the documentation to Puppet Strings and add
some basic unit tests.
2020-05-26 16:21:33 +02:00
daianamezdrea
236a115ed6 Merge pull request #428 from puppetlabs/pdksync_IAC-746
(IAC-746) - Add ubuntu 20.04 support
2020-05-21 11:24:54 +03:00
David Swan
e4912e071c (IAZ-746) - Set default params for Ubuntu 20.04 2020-05-20 17:30:56 +01:00
David Swan
43133c9a22 (IAC-746) - Add ubuntu 20.04 support 2020-05-20 15:44:44 +01:00
sheenaajay
e94f8521ef Merge pull request #427 from puppetlabs/pdksync_abs
pdksync - Use abs instead of vmpooler to provision test resources
2020-05-19 09:50:12 +01:00
Daniel Carabas
46e2a3b084 Switch to default spec_helper_acceptance file 2020-05-18 10:02:03 +03:00
Daniel Carabas
6de2b2db55 Change provision from vmpooler to abs 2020-05-18 09:55:46 +03:00
sanfrancrisko
07533d13cd Merge pull request #426 from puppetlabs/pdksync_PDK_UPDATE
pdksync - (maint) - Pdk Update
2020-05-14 11:27:16 +01:00
david22swan
484f27a79e (maint) - add back gems removed by pdk update 2020-05-14 09:28:50 +01:00
David Swan
622c3469a6 (maint) - Pdk Update 2020-05-12 15:39:48 +01:00
daianamezdrea
84bc80d881 Merge pull request #424 from puppetlabs/pdksync_dependency_gems_update
pdksync - Add dependency gems to development group
2020-04-27 15:26:03 +03:00
Daniel Carabas
602d630cf0 Add net-ssh dependency gems to development group 2020-04-27 14:26:51 +03:00
carabasdaniel
5a0d540d78 Merge pull request #421 from Filipovici-Andrei/master
(maint) correct test when java is not installed
2020-03-18 14:06:59 +02:00
gimmy
c3104ce39b (maint) correct test when java is not installed 2020-03-18 12:48:22 +02:00
cmccrisken-puppet
3d49162219 Merge pull request #416 from puppetlabs/pdksync_weekly_run
pdksync - Update weekly scheduled workflows
2020-03-12 12:09:54 +00:00
Daniel Carabas
01e717777f Update weekly workflow schedule 2020-03-12 11:48:35 +00:00
carabasdaniel
d9627f96e8 Merge pull request #419 from michaeltlombardi/maint/master/update-docker-image-names
(MAINT) Update docker image names
2020-03-10 09:42:47 +02:00
Michael T Lombardi
708a94f253 (MAINT) Update docker image names
Prior to this commit the provision file referenced the old
waffleimage repo for CI docker images to use. This commit
updates the file to point at litmusimage, which is the repo
the latest images are released to.
2020-03-09 21:46:58 -05:00
Michael T Lombardi (He/Him)
e0da673208 Merge pull request #418 from puppetlabs/pdksync_IAC-555
pdksync - (IAC-555) - Remove distelli-manifest.yml
2020-03-09 10:33:19 -05:00
David Swan
504fe4c0ff (IAC-555) - Remove distelli-manifest.yml 2020-03-06 12:37:46 +00:00
sheenaajay
f9ea9470d5 Merge pull request #417 from puppetlabs/pdksync_PDK_UPDATE
pdksync - (maint) - Pdk Update
2020-03-03 11:41:19 +00:00
David Swan
76cca5c33d (maint) - Pdk Update 2020-02-27 13:14:56 +00:00
sheenaajay
ab55fc141b Merge pull request #413 from puppetlabs/pdksync_weekly_run
pdksync - Add weekly scheduled workflows
2020-02-25 12:28:32 +00:00
Daniel Carabas
9551b4284b Add weekly workflow on default branch 2020-02-20 11:36:34 +02:00
carabasdaniel
ff922b58dc Merge pull request #412 from puppetlabs/release
Release merge-back v6.2.0
2020-02-19 11:41:56 +02:00
Daniel Carabas
2e16e093f2 Change Rspec test execution to serial mode 2020-02-19 09:03:21 +02:00
Auto-release
86a66d5732 Release version 6.2.0 2020-02-18 14:31:44 +00:00
sheenaajay
cc50bff4e2 Merge pull request #411 from carabasdaniel/master
[IAC-545] Skip acceptance tests for AdoptOpenJDK on SLES
2020-02-18 14:25:16 +00:00
Daniel Carabas
35dba98f4b Skip acceptance tests for AdoptOpenJDK on SLES 2020-02-18 15:35:38 +02:00
cmccrisken-puppet
35dcaf1cb5 Merge pull request #410 from puppetlabs/pdksync_IAC-215-2
pdksync - (IAC-215) - Implement use_litmus:true
2020-02-17 14:27:47 +00:00
David Swan
2e72a1e255 (IAC-215) - Pdk Update 2020-02-14 14:37:07 +00:00
David Swan
84654700bc (IAC-215) - Implement use_litmus:true 2020-02-14 14:29:32 +00:00
sheenaajay
9651f5e630 Merge pull request #370 from timdeluxe/adoptopenjdk
Support AdoptOpenJDK
2020-02-13 11:12:36 +00:00
Daniel Carabas
1cdeba11f1 Fix unit tests 2020-02-13 11:46:28 +02:00
daianamezdrea
11c314814e Merge pull request #406 from hdeheer/modern_facts
Replace legacy facts by modern facts
2020-02-11 14:09:02 +02:00
david22swan
358d1e85d0 Merge pull request #408 from puppetlabs/pdksync_pdksync-honeycombsetup
(IAC-365) updating tokens and dataset for honeycomb
2020-02-06 16:29:27 +00:00
sheena
415f1283d2 (IAC-365) updating tokens and dataset for honeycomb 2020-02-06 13:41:12 +00:00
Michael T Lombardi (He/Him)
db27f84760 Merge pull request #407 from puppetlabs/release
(maint) Merge back for release version 6.1.0
2020-02-03 15:43:05 -06:00
Auto-release
e54f5b4f08 Release version 6.1.0 2020-02-03 16:07:00 +00:00
Hubert de Heer
93cc972768 Replace legacy facts by modern facts
Fix minor puppet-lint issues.
2020-02-03 13:27:36 +01:00
lionce
84546ca9a7 Rebase with master, fix conflicts and rubocop issues 2020-01-16 15:39:32 +02:00
lionce
c4c56cd6c5 Merge pull request #405 from puppetlabs/pdksync_deb10
pdksync - (FM-8581) - Debian 10 added to travis and provision file refactored
2020-01-15 12:40:50 +02:00
Tim Eilers
61ace5ea01 Fixing several facts due to different version scheme and locations in
specific java versions
2020-01-14 14:19:14 +02:00
Tim Eilers
4f52cee832 Fixing java_version fact, because OpenJDK puts a date after version 2020-01-14 14:17:18 +02:00
Tim Eilers
4dbf9321eb Fix basedir management (correctly avoid duplicate resource declarations) 2020-01-14 14:15:52 +02:00
Tim Eilers
da548082fe Clean up code according to rubocop checks 2020-01-14 14:15:52 +02:00
Tim Eilers
c0748f164f Refactor and improve code with experience from testing.
Add spec and acceptance tests for new code.
Extend documentation for new AdoptOpenJDK feature.
2020-01-14 14:15:51 +02:00
Tim Eilers
a88f01321d Fixing install path for default values for jdk 8 and improving comparison when version was given as integer 2020-01-14 11:08:54 +02:00
Tim Eilers
4c336b3ca7 Fixing downloadfolder prefix for AdoptOpenJDK installation 2020-01-14 11:08:54 +02:00
Tim Eilers
f44bc27a17 Adding defined type for AdoptOpenJDK installation 2020-01-14 11:08:54 +02:00
David Swan
6cda8ef5ba (FM-8581) - Debian 10 added to travis and provision file refactored 2020-01-13 12:07:04 +00:00
david22swan
0a77898e3d Merge pull request #404 from puppetlabs/pdksync_travis-updates
pdksync - (maint) travis updates: bundler and slack
2019-12-17 09:41:48 +00:00
David Schmitt
2b641fd530 (maint) update travis to notify puppet slack 2019-12-16 20:57:22 +00:00
David Schmitt
1bfe4da05a (maint) update travis to not use bundle update --system 2019-12-16 20:14:40 +00:00
Molly Waggett
6bdf734416 (maint) Remove MAINTAINERS file 2019-12-10 10:14:10 -08:00
david22swan
c288dbec0e Merge pull request #403 from puppetlabs/pdksync_pdksync-disableforge
pdksync - "MODULES-10236 disable deploy_to_forge for the module"
2019-12-09 15:59:33 +00:00
sheena
aa255af5ad MODULES-10236 disable deploy_to_forge for the module 2019-12-06 14:39:12 +00:00
lionce
69a75c8e6a Merge pull request #402 from puppetlabs/pdksync_pdksync-addubuntu14
pdksync - "MODULES-10242 Add ubuntu14 support back to the modules"
2019-12-06 14:48:03 +02:00
sheena
60a4af1843 MODULES-10242 Add ubuntu14 support back to the modules 2019-12-06 11:24:25 +00:00
Daniel Carabas
4ad9ec6191 Add Github Actions release workflow 2019-12-03 12:37:39 +02:00
cmccrisken-puppet
0a09bce58f Merge pull request #401 from puppetlabs/pdksync_simplecov
(MODULES-10120) enable simplecov; update to PDK 1.14.1; minor cleanups
2019-11-29 12:28:43 +00:00
David Schmitt
26e9bcfc1a (maint) Update to PDK 1.14.1 2019-11-27 18:31:35 +00:00
David Schmitt
a57d124d7d (maint) enable simplecov for ruby codecoverage testing 2019-11-25 18:25:27 +00:00
David Schmitt
e300649623 (maint) update gitignore and pdkignore for .project file removal 2019-11-21 18:16:13 +00:00
David Schmitt
d30c38266b (maint) remove obsolete gepetto .project files 2019-11-21 18:06:18 +00:00
David Schmitt
4610ca34a8 (maint) mark .gitlab-ci.yml as deleted 2019-11-21 17:18:40 +00:00
David Schmitt
fb850647a8 (maint) sort and canonicalise .sync.yml 2019-11-21 17:17:50 +00:00
lionce
0d23711e7d Merge pull request #400 from puppetlabs/release
Merge back release version v6.0.0
2019-11-11 16:23:06 +02:00
lionce
a0bab6cf38 Release version 6.0.0 2019-11-11 15:31:38 +02:00
lionce
8b451e161c Merge pull request #399 from david22swan/FM-8676
(FM-8676) - Support added for CentOS 8
2019-11-11 11:04:03 +02:00
David Swan
afb5531a4a (FM-8676) - Support added for CentOS 8 2019-11-08 16:07:59 +00:00
carabasdaniel
47a51b4490 Merge pull request #397 from lionce/MODULES-10062
MODULES-10062 - fix acceptance tests on sles
2019-11-07 12:33:16 +02:00
david22swan
b64e9a2f88 Merge pull request #398 from puppetlabs/pdksync_remove_ubuntu14_support
pdksync - FM-8499 - remove ubuntu14 support
2019-11-07 09:16:10 +00:00
lionce
6f05978750 FM-8499 - remove ubuntu14 support 2019-11-06 17:45:14 +02:00
lionce
c477db3b59 MODULES-10062 - fix acceptance tests on sles 2019-11-06 14:25:09 +02:00
lionce
00588d2b96 Merge pull request #396 from puppetlabs/pdksync_encrypt-git
pdksync - (FM-8634) ensure encrypted communication for fixtures
2019-11-05 12:43:17 +02:00
lionce
2ea5a4adb5 Merge pull request #395 from glennsarti/manage-travis
(PDK-1501) Allow Travis CI config to be templated
2019-11-05 10:46:05 +02:00
Glenn Sarti
018de0aef6 (PDK-1501) Fix acceptance stages in Travis CI
Previously the Travis CI file was brought under PDK control, however the
sync.yml did not contain the stage settings for the Litmus jobs which meant
that they did not run.  This commit fixes that error and runs PDK Update again
2019-11-05 13:31:09 +08:00
David Schmitt
74c5c27108 (FM-8634) ensure encrypted communication for fixtures 2019-11-01 16:48:53 +00:00
Glenn Sarti
ee0e10dc12 (maint) Fix rubocop failures in download_spec.rb
This commit updates the download_spec.rb file to remote the global variable and
use let based test fixture.
2019-11-01 09:49:19 +08:00
Glenn Sarti
4913dc0bef (PDK-1501) Allow Travis CI config to be templated
Previously the module unmanaged the Travis CI file when converted to Litmus.
This commit allows the Travis CI file to be managed.
2019-11-01 09:49:19 +08:00
Glenn Sarti
459757dd65 (maint) Update for PDK templates
This commit updates the module as per PDK-Templates commit 0b5b39b
2019-11-01 09:49:19 +08:00
david22swan
7ce9df174f Merge pull request #392 from michaeltlombardi/ticket/master/FM-8275-add-vagrant-provision
(FM-8275) Add vagrant provision list
2019-10-25 15:17:35 +01:00
cmccrisken-puppet
b1ea376937 Merge pull request #393 from puppetlabs/pdksync_pdksync-pdkgemupdate
pdksync - (maint) Override pdk gem version to master branch (PDK-1525 workaround until release)
2019-10-24 21:09:25 +01:00
Ciaran McCrisken
de79582baf Point pdk gem to head of master until PDK-1525 resolved 2019-10-24 15:21:53 +01:00
Michael T Lombardi
ea006c0587 (FM-8275) Add vagrant provision list
Prior to this commit the only provisioners included in
the provision lists were docker and vmpooler, neither
of which are particularly accessible to folks developing
on Windows outside of Puppet.

This commit adds a list which leverages the vagrant
provisioner.
2019-10-18 17:18:02 -05:00
carabasdaniel
e57cbc84ec Merge pull request #391 from robmbrooks/master
we need to check if java_default_home has a value before we attempt t…
2019-09-30 10:03:51 +03:00
Robert Brooks
d4e5461c26 we need to check if java_default_home has a value before we attempt to find libjvm.so, otherwise we search the entire filesystem 2019-09-26 09:57:55 -07:00
TP Honey
a5aad36b86 Merge pull request #390 from puppetlabs/fix_acceptance_tests
Fix fake paths that always cause errors
2019-09-26 10:40:37 +01:00
tphoney
f70d15207a fake paths always cause errors 2019-09-26 11:31:23 +03:00
sheenaajay
0b1f8df952 Merge pull request #389 from puppetlabs/pdksync_add_codeowners
(maint) Add a codeowners file
2019-09-18 10:38:02 +01:00
tphoney
f83cf9fc38 (maint) Add a codeowners file 2019-09-17 15:50:40 +01:00
sheenaajay
074162d034 Merge pull request #386 from vrtdev/feature/java11
Add support for java 11, the default in debian buster 10
2019-09-12 11:22:33 +01:00
sheenaajay
71b6a47798 Merge pull request #385 from leitmedium/master
ensure Java8 update number is being handled as a number
2019-09-12 09:15:14 +01:00
TP Honey
b670aca0cc Merge pull request #387 from puppetlabs/FM-8403
FM-8403 - add support Debain10
2019-09-11 15:27:19 +01:00
Caspar Clemens Mierau
27fed78308 ensure Java8 update number is being handled as a number when doing version comparing 2019-09-11 13:12:45 +02:00
lionce
ba9a1dbe45 add support Debain10 2019-09-10 16:27:01 +03:00
Jeroen Hooyberghs
197213e517 Put test result in variable to satisfy RuboCop 2019-09-10 14:33:49 +02:00
Jeroen Hooyberghs
21d39590b0 Add support for java 11, the default in debian buster 10 2019-09-10 12:21:19 +02:00
TP Honey
00c05a826f Merge pull request #384 from puppetlabs/pdksync_net-ssh-fix
pdksync - (MAINT) pdksync: fix for net-ssh 5 host_key check
2019-08-29 16:02:07 +01:00
Florin Dragos
d277391efc (MAINT) pdksync: fix for net-ssh 5 host_key check 2019-08-29 17:09:24 +03:00
sheenaajay
ce34499671 Merge pull request #382 from puppetlabs/release
MODULES-9673 Release merge back v5.0.1
2019-08-12 12:18:21 +01:00
lionce
b632db3a3e Merge pull request #381 from sheenaajay/releaseprep
MODULES-9669 Release preparation for v5.0.1
2019-08-05 13:48:01 +03:00
sheena
9c8d34f7e7 MODULES-9669 Release preparation for v5.0.1 2019-08-05 11:10:39 +01:00
carabasdaniel
af9c6c1bbe Merge pull request #380 from puppetlabs/release
MODULES-9608 Release Merge back v5.0.0
2019-08-05 12:58:18 +03:00
sheenaajay
70fa42b5c7 Merge pull request #379 from RandomNoun7/release
(MODULES-9604) Release prep - 5.0.0
2019-07-29 15:57:20 +01:00
Bill Hurt
0026df5de1 (MODULES-9604) Release prep - 5.0.0 2019-07-29 07:31:19 -07:00
TP Honey
ce58b6793e Merge pull request #372 from carabasdaniel/master
[FM-8320] Remove Oracle download
2019-07-29 11:02:29 +01:00
Daniel Carabas
a7f5b49404 Remove Oracle download support 2019-07-26 17:47:20 +02:00
William Hurt
c3d6da014f Merge pull request #377 from tphoney/pdk_convert_gemfile
(maint) rerun pdk convert,remove systemtests gems
2019-07-25 10:08:26 -07:00
tphoney
ab9efa8405 (maint) rerun pdk convert,remove systemtests gems 2019-07-25 17:20:07 +01:00
Michael T Lombardi (He/Him)
983efef86a (FM-8223) converted to use litmus (#376)
(FM-8223) converted to use litmus
2019-07-25 10:32:11 -05:00
tphoney
b9564626d3 (FM-8223) converted to use litmus 2019-07-25 14:46:20 +01:00
lionce
ff0b03eb72 Merge pull request #375 from tphoney/FM-8343
(FM-8343) use release numbers not lsbdistcodename
2019-07-25 13:48:43 +03:00
tphoney
7b73f579c0 (FM-8343) use release numbers not lsbdistcodename 2019-07-25 10:46:05 +01:00
TP Honey
614d624e5d Merge pull request #369 from mhjacks/master
Add buster support, default to 11
2019-07-17 13:37:35 +01:00
carabasdaniel
2bdc458965 Merge pull request #374 from puppetlabs/revert-364-feature/debian_buster
Revert "Add support for debian buster"
2019-07-17 14:30:53 +03:00
TP Honey
48b5d0209d Revert "Add support for debian buster" 2019-07-17 12:14:28 +01:00
carabasdaniel
bd22547e1e Merge pull request #373 from puppetlabs/pdksync_pdksync_heads/master-0-gb096033
pdksync - pdksync_heads/master-0-gb096033
2019-07-16 12:06:09 +03:00
lionce
77c18be58b pdksync_heads/master-0-gb096033 2019-07-16 10:05:15 +03:00
TP Honey
88d31a7a64 Merge pull request #364 from vrtdev/feature/debian_buster
Add support for debian buster
2019-07-15 10:42:23 +01:00
Eimhin Laverty
2a81a6cd07 Merge pull request #371 from puppetlabs/readme_bsd
(maint) Remove BSD section for puppet < 4
2019-07-11 16:00:36 +01:00
TP Honey
68e1d7681d (maint) Remove BSD section for puppet < 4 2019-07-10 16:24:09 +01:00
Martin Jackson
9d0301b1ef Add buster support, default to 11 2019-06-18 20:57:32 -05:00
Paula Muir
ae2baf0006 Merge pull request #368 from puppetlabs/pdksync_pdksync_heads/master-0-g7827fc2
pdksync - pdksync_heads/master-0-g7827fc2
2019-06-10 14:49:36 +01:00
Erick Banks
4e36ff899c pdksync_heads/master-0-g7827fc2 2019-06-10 13:35:53 +01:00
sheenaajay
bcc6263e14 Merge pull request #357 from mhjacks/master
Support defaults for ubuntu cosmic and dingo
2019-06-06 10:12:09 +01:00
Tom Ritserveldt
92a9700ad3 Add support for Debian buster 2019-06-04 07:49:14 +02:00
TP Honey
2c624c2800 Merge pull request #367 from puppetlabs/release
(MODULES-9189) - Release Merge back 4.1.0
2019-05-29 18:14:33 +01:00
TP Honey
d12df5926b Merge pull request #366 from eimlav/modules-9185
(MODULES-9185) Release prep v4.1.0
2019-05-29 15:45:00 +01:00
Eimhin Laverty
16fb46b958 (MODULES-9185) Release prep v4.1.0 2019-05-29 14:57:44 +01:00
TP Honey
f52a16d613 Merge pull request #365 from eimlav/modules-9184
(MODULES-9184) Update puppet-archive dependency
2019-05-29 14:45:50 +01:00
Eimhin Laverty
33864e88b1 (MODULES-9184) Update puppet-archive dependency 2019-05-29 12:16:03 +01:00
sheenaajay
35192452d9 Merge pull request #363 from eimlav/fm-8028
(FM-8028) Add RedHat 8 support
2019-05-21 10:04:17 +01:00
sheenaajay
2b03380440 Merge pull request #362 from puppetlabs/release
(MODULES-9132) Release mergeback v4.0.0
2019-05-20 10:19:58 +01:00
lionce
412ad38d93 Merge pull request #361 from sheenaajay/releaseprep
(MODULES-9128) Release 4.0.0
2019-05-20 10:34:18 +03:00
Eimhin Laverty
0418aaa3c2 (FM-8028) Add RedHat 8 support 2019-05-16 16:24:38 +01:00
sheena
7474169cbe (MODULES-9128) Release prep 4.0.0 2019-05-16 14:41:56 +01:00
carabasdaniel
45d9a2fb48 Merge pull request #359 from lionce/MODULES-9017
(MODULES-9017) - update metadata to support current version of stdlib
2019-05-03 05:59:27 -07:00
lionce
ba62a166d8 (MODULES-9017) - update metadata to support current version of stdlib 2019-05-03 14:54:46 +03:00
Martin Jackson
2ede3f1f06 Support eoan too while we're here 2019-04-27 08:39:23 -05:00
lionce
b174146dd0 Merge pull request #344 from HielkeJ/jce_link
MODULES-8613: Add option to set a custom JCE download URL
2019-04-23 13:16:18 +03:00
Hielke Jager
f195588082 Merge branch 'master' into jce_link 2019-04-18 19:46:07 +02:00
sheenaajay
c3e09bf110 Merge pull request #358 from puppetlabs/pdksync_pdksync_f778803
pdksync - (maint) Update pdk-template to f778803
2019-04-16 11:10:33 +01:00
Eimhin Laverty
b8e5438663 pdksync - (maint) Update pdk-template to f778803 2019-04-15 10:34:13 +01:00
TP Honey
76da37deb7 Merge pull request #353 from david22swan/FM-7921
(FM-7921) - Implement Puppet Strings
2019-04-15 10:33:36 +01:00
Martin Jackson
16fa2379a2 Support defaults for ubuntu cosmic and dingo 2019-04-14 15:08:46 -05:00
David Swan
8abe137a8c (FM-7921) - Implement Puppet Strings 2019-04-12 11:57:31 +01:00
Lavinia Dan
78bdfa2ffe Merge pull request #356 from puppetlabs/pdksync_MODULES-8444
pdksync - (MODULES-8444) - Raise lower Puppet bound
2019-04-11 16:07:20 +03:00
David Swan
24da374183 (MODULES-8444) - Raise lower Puppet bound 2019-04-10 16:39:28 +01:00
david22swan
b998142817 Merge pull request #351 from puppetlabs/pdksync_modules-8728
pdksync - Remove .project from .gitignore
2019-03-07 14:19:09 +00:00
Eimhin Laverty
881bcfabea (MODULES-8728) Remove .project from .gitignore 2019-03-07 12:43:24 +00:00
david22swan
ce348b258f Merge pull request #349 from fraenki/creates_path
MODULES-8698: Fix $install_path on CentOS with tar.gz package type
2019-03-06 15:25:23 +00:00
david22swan
fa7003da95 Merge pull request #348 from fraenki/symlink
MODULES-8699: Add option to manage symlink
2019-03-06 12:00:06 +00:00
Eimhin Laverty
7cd34dd291 (FM-7795) Cleanup java tests (#350)
* Add idempotent_apply function

* Remove unsupported OS specific code

* Remove outdated comments

* Improve unit test coverage

* Fix typo
2019-02-26 14:22:27 +02:00
Frank Wall
c81254a23a Fix $install_path on CentOS with tar.gz package type
When using tar.gz packages on CentOS, the architecture is not
part of the name of the installation directory. In this case
it's just "jdk1.8.0_201" instead of "jdk1.8.0_201-amd64".
2019-02-25 16:14:14 +01:00
Frank Wall
343ad7c468 Add option to manage symlink 2019-02-25 14:44:26 +01:00
Valentin
5509042cd1 Update default version & java 8 version from 8u192 to 8u201 (#347)
* Update default version & java 8 version from 8u192 to 8u201
2019-02-25 11:46:52 +00:00
Eimhin Laverty
3d8f80e4d9 Merge pull request #346 from tphoney/MODULES-3958
(MODULES-3958) use rspec-mock and add coverage
2019-02-14 14:25:22 +00:00
tphoney
7293c4991b (MODULES-3958) use rspec-mock and add coverage 2019-02-14 13:51:16 +00:00
david22swan
7bede1a384 Merge pull request #345 from fraenki/location_fix
Add ability to override basedir and package type for oracle java
2019-02-12 15:20:18 +00:00
Frank Wall
c4100556f0 use variable instead of hardcoded value, refs #298 2019-02-12 13:29:18 +01:00
Frank Wall
e247902da5 fix tests, refs #298 2019-02-12 13:28:56 +01:00
Elyse Salberg
82cd45647a Add ability to override basedir and package type 2019-02-12 13:27:32 +01:00
Hielke Jager
9b40ca6935 Add option to set a custom JCE download URL 2019-02-08 16:10:03 +01:00
david22swan
1e8954727e Merge pull request #332 from TLmaK0/master
Get architecture when no os/architecture exists
2019-02-07 16:08:22 +00:00
Paula Muir
b2a0626787 Merge pull request #343 from puppetlabs/pdksync_pdksync_1.9.0-0-g7281db5
pdksync - pdksync_1.9.0-0-g7281db5
2019-01-31 12:15:24 +00:00
lionce
f7f3fb9da2 pdksync_1.9.0-0-g7281db5 2019-01-31 11:22:53 +02:00
david22swan
25898c0fc9 Merge pull request #342 from puppetlabs/release
(maint) - 3.3.0 Release mergeback
2019-01-18 10:51:14 +00:00
Paula Muir
1021c71139 Merge pull request #341 from david22swan/ReleasePrep
(MODULES-8478) - 3.3.0 Release Prep
2019-01-17 10:55:28 +00:00
David Swan
66a6e6c28e (MODULES-8478) - 3.3.0 Release Prep 2019-01-16 15:36:22 +00:00
Helen
197bd5fe7f Merge pull request #340 from puppetlabs/pdksync_pdksync_heads/master-0-g6814a87
pdksync - pdksync_heads/master-0-g6814a87
2019-01-14 15:44:25 +00:00
David Swan
ed5fd0d528 pdksync_heads/master-0-g6814a87 2019-01-10 15:29:50 +00:00
davidmalloncares
be8c53be64 Merge pull request #339 from puppetlabs/pdksync_pdksync_heads/master-0-g9c815ea
pdksync - pdksync_heads/master-0-g9c815ea
2019-01-03 15:58:14 +00:00
David Swan
cec95965d0 pdksync_heads/master-0-g9c815ea 2019-01-03 14:33:56 +00:00
Eimhin Laverty
32506eb127 Merge pull request #338 from puppetlabs/pdksync_FM-7655
pdksync - (FM-7655) Fix rubygems-update for ruby < 2.3
2018-12-20 10:46:41 +00:00
tphoney
4898fbdfaa (FM-7655) Fix rubygems-update for ruby < 2.3 2018-12-20 10:09:32 +00:00
Helen
dd2c5b08df Merge pull request #337 from puppetlabs/pdksync_pdksync_heads/master-0-gbf720df
pdksync - pdksync_heads/master-0-gbf720df
2018-12-17 14:08:03 +00:00
Eimhin Laverty
9526767b95 pdksync_heads/master-0-gbf720df 2018-12-17 11:31:10 +00:00
david22swan
35f5fa9e33 Merge pull request #336 from eimlav/modules-8234
(MODULES-8234) - Add SLES 15 support
2018-12-14 14:26:34 +00:00
Eimhin Laverty
1504bf8974 (MODULES-8234) - Add SLES 15 support 2018-12-13 12:57:47 +00:00
Eimhin Laverty
5112b4d59f Merge pull request #335 from pmcmaw/bugfix_FM-7520
(FM-7520) - Removing Solaris from the support matrix
2018-11-19 11:18:46 +00:00
Paula Muir
ed5cbf950e Merge branch 'master' into bugfix_FM-7520 2018-11-19 11:00:10 +00:00
Paula Muir
cd46267fad (maint) - Standardising and removing Service Packs (SP) 2018-11-19 10:58:55 +00:00
Paula Muir
7405a304d9 (FM-7520) - Removing Solaris from the support matrix
This is a bug fix as Solaris has never worked on this module. Updating
to resolve the issue with our documentation.
2018-11-19 10:58:54 +00:00
Paula Muir
b4bb7f0b89 Merge pull request #334 from eimlav/modules-8234
(MODULES-8234) - Upgrade Oracle Java version to 8u192
2018-11-09 15:25:41 +00:00
Eimhin Laverty
68fb4fa498 (MODULES-8234) - Upgrade Oracle Java version to 8u192 2018-11-09 11:05:24 +00:00
Paula Muir
7243839129 Merge pull request #333 from puppetlabs/pdksync_pdksync_heads/master-0-gabccfb1
pdksync - pdksync_heads/master-0-gabccfb1
2018-11-07 13:21:10 +00:00
David Swan
a5ea78aeb4 pdksync_heads/master-0-gabccfb1 2018-11-07 10:22:33 +00:00
david22swan
89a205bc48 Merge pull request #314 from ojongerius/oracle_java_181
MODULES-8044: upgrade Oracle Java 8 to 181, make it the default release
2018-11-05 10:14:28 +00:00
Otto Jongerius
0fd7c00fa9 upgrade Oracle Java 8 to 181, make it the default release 2018-11-05 16:06:43 +13:00
david22swan
de89b1f2da Merge pull request #315 from olevole/master
MODULES-7819 fix set JAVA_HOME environments on FreeBSD platform
2018-11-02 13:46:10 +00:00
Hugo Freire
4372aea5bf Get architecture when no os/architecture exists 2018-10-26 13:12:53 +02:00
Eimhin Laverty
ca4b22c7a0 Merge pull request #331 from pmcmaw/FM-7520
(FM-7520) - Removing service pack extensions
2018-10-24 16:10:51 +01:00
Paula Muir
0acc804564 (FM-7520) - Removing service pack extensions
We support SLES11 and SLES12. It is not necessary to state the SP
therefore removing the SPs.
2018-10-23 17:30:56 +01:00
Dennis Ploeger
b53a78fbe8 Support for installing JCE. Fixes MODULES-1681 (#326)
* Support for installing JCE. Fixes MODULES-1681

* Disabled oracle tests. Only to be enabled, if the other configuration options match the current java download URL provided by Oracle.
2018-10-18 10:07:37 +01:00
david22swan
390805475e Merge pull request #329 from mmoll/deb_openjdk_arm
Fix OpenJDK paths on Debian based OS with ARM
2018-10-12 16:46:41 +01:00
Michael Moll
911df2d7b7 Fix OpenJDK paths on Debian based OS with ARM 2018-10-12 16:55:50 +02:00
david22swan
61ffb4bf1d Merge pull request #330 from dodevops/MODULES-8085
Optimized code for making java::oracle atomic. Fixes MODULES-8085
2018-10-12 14:47:36 +01:00
Dennis Ploeger
bf26247f55 Fixed style violations 2018-10-12 14:27:59 +02:00
david22swan
c6acb9906c Merge pull request #322 from syseleven/MODULES-8025
(MODULES-8025) Switch default for Ubuntu 18.04 to 11
2018-10-12 11:50:36 +01:00
Dennis Ploeger
5f1b7ecea8 Optimized code for making java::oracle atomic. Fixes MODULES-8085 2018-10-12 07:43:57 +02:00
Paula Muir
615db5f7c6 Merge pull request #323 from eimlav/modules7050
(MODULES-7050) - Fix OracleJDK reinstalling on Puppet runs
2018-10-03 17:40:50 +01:00
Eimhin Laverty
89aa846909 (MODULES-7050) - Fix OracleJDK reinstalling on Puppet runs 2018-10-03 17:26:03 +01:00
Matthias Baur
60c93866b1 (MODULES-8025) Switch default for Ubuntu 18.04 to 11
This is needed to get the default Java version rollout with Ubuntu
18.04.
2018-10-01 18:08:30 +02:00
david22swan
72e042afad Merge pull request #320 from puppetlabs/release
Release merge back 3.2.0
2018-09-27 15:51:16 +01:00
Eimhin Laverty
8de3ea58a3 Merge pull request #319 from david22swan/PreRelease
(MODULES-7898) - 3.2.0 Release Prep
2018-09-27 12:09:50 +01:00
David Swan
1b56da5a27 (MODULES-7898) - 3.2.0 Release Prep 2018-09-27 12:03:18 +01:00
david22swan
380b8d749d Merge pull request #317 from puppetlabs/pdksync_MODULES-6805
pdksync - (MODULES-6805) metadata.json shows support for puppet 6
2018-09-27 11:12:15 +01:00
david22swan
7cb684c3c0 Merge pull request #318 from puppetlabs/pdksync_FM-7392_pdk_update
pdksync - (FM-7392) - Puppet 6 Testing Changes
2018-09-25 09:31:45 +01:00
Paula Muir
2926bbcfcb (FM-7392) - Puppet 6 Testing Changes 2018-09-24 17:02:26 +01:00
tphoney
a63f788394 (MODULES-6805) metadata.json shows support for puppet 6 2018-09-20 16:33:43 +01:00
olevole
728fc7e02d fix set JAVA_HOME environments on FreeBSD platform
FreeBSD do not use /etc/environment file for global variables. Instead we use two
places to set the variable:
  - /etc/profile for sh(1)
  - /etc/csh.login for csh(1) which is the default shell for FreeBSD

Fixes for MODULES-7819 issue
2018-09-20 14:22:37 +03:00
Eimhin Laverty
58669e653c Merge pull request #313 from puppetlabs/release
3.1.0 Mergeback
2018-09-10 10:01:49 +01:00
Eimhin Laverty
255406b30f Merge pull request #312 from david22swan/PreRelease
3.1.0 Pre Release
2018-09-06 16:30:26 +01:00
David Swan
a24f8f15ea 3.1.0 Pre Release 2018-09-06 16:21:26 +01:00
Eimhin Laverty
5d07f08126 Merge pull request #311 from puppetlabs/pdksync_pdksync-beaker4
pdksync - (MODULES-7658) use beaker4 in puppet-module-gems
2018-08-31 14:30:05 +01:00
tphoney
01b95d32c6 (MODULES-7658) use beaker4 in puppet-module-gems 2018-08-30 17:07:43 +01:00
Helen
3c9f98d75e Merge pull request #310 from puppetlabs/pdksync_bumping_puppet_version
pdksync - (MODULES-7705) - Bumping stdlib dependency from < 5.0.0 to < 6.0.0
2018-08-28 10:04:24 +01:00
Paula Muir
e0b0e1cd19 (MODULES-7705) - Bumping stdlib requirement to 6.0.0 2018-08-24 09:15:08 +01:00
Helen
7067aed306 Merge pull request #305 from puppetlabs/pdksync_1.7.0-0-g57412ed
pdksync - Update using 1.7.0
2018-08-22 14:56:33 +01:00
Paula Muir
cb637faf83 pdksync_1.7.0-0-g57412ed 2018-08-22 14:33:05 +01:00
Eimhin Laverty
66023e1a66 Merge pull request #304 from puppetlabs/pdksync_pdksync-beaker3
pdksync - (MODULES-7658) use beaker3 in puppet-module-gems
2018-08-21 16:22:10 +01:00
tphoney
743006a16e (MODULES-7658) use beaker3 in puppet-module-gems 2018-08-21 15:27:02 +01:00
Paula Muir
d5d69ee5ac Merge pull request #303 from puppetlabs/release
Release merge back 3.0.0
2018-08-14 10:57:03 +01:00
Paula Muir
2124c735f5 Merge pull request #302 from eimlav/release-prep
(MODULES-7661) - Release prep for 3.0.0 release
2018-08-13 15:24:00 +01:00
Eimhin Laverty
b0e6bc6d84 (MODULES-7661) - Release prep for 3.0.0 release 2018-08-13 14:55:23 +01:00
david22swan
016772c800 Merge pull request #301 from eimlav/update-limitations
(MODULES-7629) - Update README Limitations section
2018-08-09 16:35:26 +01:00
Eimhin Laverty
42556dfff3 (MODULES-7629) - Update README Limitations section 2018-08-09 14:31:49 +01:00
Helen
2bdbc7df04 Merge pull request #299 from david22swan/MODULES-7561
(MODULES-7561) - Addition of support for Ubuntu 18.04 to java
2018-08-01 11:02:32 +01:00
David Swan
56c1d80150 (MODULES-7561) - Addition of support for Ubuntu 18.04 to java 2018-07-31 15:08:59 +01:00
david22swan
ca5ef782f3 Merge pull request #296 from mpdude/patch-1
Allow this package to be installed together with puppet-archive 3.0.0
2018-06-15 10:39:12 +01:00
Matthias Pigulla
b5297d553b Allow this package to be installed together with puppet-archive 3.0.0
Although it's a major version bump, I don't expect this module here to be impacted of the changes.
2018-06-14 17:33:34 +02:00
Helen
bdcb2c628f Merge pull request #295 from david22swan/FM-6963
[FM-6963] Removal of unsupported OS from java
2018-06-04 09:09:13 +01:00
David Swan
a99915342b [FM-6963] Removal of unsupported OS from java 2018-06-01 14:59:13 +01:00
david22swan
d6eb532960 Merge pull request #294 from puppetlabs/pdksync_heads/master-0-g34e3266
pdksync - Update using 1.5.0
2018-05-18 15:36:33 +01:00
Helen Campbell
891b70a7c6 pdksync_heads/master-0-g34e3266 2018-05-18 15:21:46 +01:00
david22swan
3ba9230b0b Merge pull request #292 from HelenCampbell/gitlabfix
Fixing typo in sync.yml
2018-05-16 17:57:24 +01:00
Helen Campbell
3a35964083 Fixing typo in sync.yml 2018-05-16 17:44:48 +01:00
david22swan
cf1028b8b2 Merge pull request #290 from pmcmaw/unmanage_gitlab
(MODULES-7153) - Unmanage gitlab-ci.yml
2018-05-11 13:30:39 +01:00
Paula McMaw
241800601a (MODULES-7153) - Unmanage gitlab-ci.yml 2018-05-11 11:43:07 +01:00
Paula Muir
2c5397c66c Merge pull request #289 from HelenCampbell/syncupdate
(MODULES-7023) Update .sync.yml for pdk update
2018-04-26 17:06:24 +01:00
Helen Campbell
d7ab10786e (MODULES-7023) Update .sync.yml for pdk update 2018-04-26 15:04:48 +01:00
david22swan
e1173e59c7 Merge pull request #287 from sevencastles/remove_ensure_resource
Remove ensure_resource to avoid potential conflict
2018-02-26 13:47:17 +00:00
Carlo Rengo
6ba478375a Remove ensure_resource to avoid potential conflict
This was probably unintended and could cause conflicts where
stdlib::stages isn't desired.
2018-02-02 10:21:53 +01:00
Helen
47afbd2462 Merge pull request #286 from puppetlabs/release
Release merge back 2.4.0
2018-01-23 16:59:32 +00:00
Paula Muir
10503819d2 Merge pull request #285 from HelenCampbell/release
Release prep 2.4.0
2018-01-23 15:24:15 +00:00
Helen Campbell
5db3084c11 Release prep 2.4.0 2018-01-23 14:58:42 +00:00
Paula Muir
10dc3068a7 Merge pull request #284 from HelenCampbell/conversion1.3.2
PDK Convert 1.3.2
2018-01-23 14:16:32 +00:00
Helen Campbell
b4490a36b3 Remove bundle update command 2018-01-23 13:53:30 +00:00
Helen Campbell
6561d98e58 PDK Convert 1.3.2 2018-01-23 13:42:24 +00:00
TP Honey
61cfbe3154 Merge pull request #283 from HelenCampbell/javahometestfix
Fixes java_home for SLES 11.4 and relevant tests
2018-01-23 10:22:39 +00:00
Helen Campbell
85c17ef66f Fixes the tests for SLES java_home location 2018-01-23 09:55:13 +00:00
mirespace
697c1911f9 $java_home for SLES 11.4
Fixed java_home for matching package to be installed
2018-01-16 11:14:51 +01:00
Paula Muir
c8ce18949b Merge pull request #281 from puppetlabs/msync_MODULES-6339
(maint) modulesync 65530a4 Update Travis
2018-01-05 15:50:32 +00:00
Michael T Lombardi
9c103a2219 (maint) modulesync 65530a4 Update Travis
Related: https://github.com/puppetlabs/modulesync_configs/pull/177
2018-01-03 16:12:39 -06:00
TP Honey
61c8794661 (maint) - modulesync 384f4c1 (#280) 2017-12-13 12:14:15 +00:00
Paula McMaw
901bfe989a Merge pull request #279 from tphoney/FM-6634
FM-6634 rubocop fixes
2017-12-06 15:59:33 +00:00
tphoney
e53b8bb563 FM-6634 rubocop fixes 2017-12-06 15:47:27 +00:00
david22swan
77b2b199e4 Merge pull request #278 from puppetlabs/release
Release mergeback 2.3.0
2017-12-01 15:27:25 +00:00
TP Honey
6db8715496 Merge pull request #277 from david22swan/PreRelease
2.3.0PreRelease
2017-11-29 10:08:54 +00:00
David Swan
4911fe8c77 2.3.0PreRelease 2017-11-28 10:24:28 +00:00
david22swan
fb3e4c4151 Merge pull request #270 from mhjacks/master
Add support for Ubuntu artful (17.10) and bionic (18.04 to be)
2017-11-28 09:25:38 +00:00
TP Honey
9596929938 Merge pull request #274 from puppetlabs/release
Mergeback
2017-11-27 11:16:33 +00:00
Paula McMaw
e0ce74e1a0 Merge pull request #273 from jearls/MODULES-6105-fix-travis-block-for-sync-yml
MODULE-6105: Move `.sync.yml` travis configuration under `.travis.yml:`
2017-11-27 09:20:44 +00:00
Johnson Earls
f80686908c MODULE-6105: Move .sync.yml travis configuration under .travis.yml:
This allows `modulesync` to work again for this module.
2017-11-26 16:21:55 +00:00
david22swan
74d70dae04 Merge pull request #271 from willmeek/rubocopification
Cleanup ruby code via rubocop
2017-11-24 15:26:19 +00:00
Paula McMaw
5ad9e400a2 Merge pull request #272 from puppetlabs/MODULES-4179
MODULES-4179 Updated Oracle Java supported list
2017-11-23 14:50:18 +00:00
Davin Hanlon
078307484f Updated Oracle Java supported list
Added CentOs7 and RHEL7 to Oracle Java supported list
2017-11-23 13:57:21 +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
Martin Jackson
71554f3067 Add support for Ubuntu artful (17.10) and bionic (18.04 to be) 2017-11-20 21:11:32 -06:00
Paula McMaw
692b490438 Release prep for 2.2.0 (#268) 2017-11-20 17:21:33 +00:00
Paula McMaw
7a271eef3e Module sync 1d81b6a (#267) 2017-11-17 15:32:24 +00:00
Paula McMaw
39113d885a Merge pull request #266 from willmeek/release_2_2_0
Release prep for 2.2.0
2017-11-16 14:46:57 +00:00
Will Meek
d0c9b41d9d Release prep for 2.2.0 2017-11-16 14:33:26 +00:00
Paula McMaw
d336d79c04 Merge pull request #265 from willmeek/realpath_test_fix
Realpath test fix
2017-11-16 10:59:40 +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
Sebastian Reitenbach
bdfc567c18 OpenBSD doesn't have /etc/environment, therefore there is no
need to fiddle with it. The default case statement, "do nothing"
is all fine here.

Facter::Util::Resolution.with_env is long time gone since
Facter > 2.x. That was even longer before introduced by me.
Remove that OpenBSD special case in the java_version fact,
and assume that $PATH is properly set in order to find
the 'java' binary.

Additionally confine the java_default_home and java_libjvm_path
to OpenBSD kernel as well. Add some flesh to the java_default_home
fact to allow it to find the java binary.
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
Paula McMaw
d49c1f0e29 Merge pull request #264 from puppetlabs/release
2.1.1 Release Mergeback
2017-11-09 13:48:10 +00:00
Eric Putnam
336a0e2e1a Merge pull request #263 from pmcmaw/paulaTesting
(FM-6503) - Release Prep for 2.2.1
2017-11-08 09:25:50 -08:00
Paula McMaw
6592edd454 (FM-6503) - Release Prep for 2.2.1 2017-11-06 15:35:10 +00:00
Helen
e6e961e7fc Merge pull request #261 from bastelfreak/bumparchivebmjenplsmerge
allow latest archive version as dependency
2017-10-09 17:51:01 +01:00
Tim Meusel
2b2e639531 allow latest archive version as dependency 2017-10-09 18:30:09 +02: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
TP Honey
cb7105f4a2 Merge pull request #258 from shuebnersr/fact1760_test_for_java_version_when_java_not_installed
Fact1760 test for java version when java not installed
2017-09-26 14:00:12 +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
18bd3fcb86 Merge pull request #2 from shuebnersr/fact1760_test_for_java_version_when_java_not_installed
Fact1760 test for java version when java not installed
2017-09-22 12:00:35 +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
shuebnersr
318f8864fd Merge pull request #1 from puppetlabs/master
sync
2017-09-22 11:39:28 +02:00
TP Honey
62f054649a Merge pull request #256 from puppetlabs/msync_18sep17_892c4cf
(maint) modulesync 892c4cf
2017-09-21 13:52:59 +01:00
shuebnersr
d89532435d search for matching line with java version
do not just try to read java version from first line, but search for the matching line from java output
2017-09-20 14:26:04 +02:00
Hailee Kenney
6397c0870b (maint) modulesync 892c4cf 2017-09-18 14:56:13 -07:00
Paula McMaw
e4888a507e Merge pull request #255 from Andor/master
Support for Ubuntu 17.04 Zesty Zapus
2017-09-08 11:41:23 +01:00
Andrew N Golovkov
525016ec02 Support for Ubuntu 17.04 Zesty Zapus 2017-09-06 20:44:48 +03:00
Helen
c5005d9cc1 Merge pull request #254 from pmcmaw/rm_debian6
Removing Debian 6
2017-08-31 11:30:33 +01:00
Paula McMaw
7f8bb518f0 Removing Debian 6
According to the followin page Debian 6 is no longer supported as an
Agent. https://docs.puppet.com/pe/latest/sys_req_os.html
2017-08-31 11:20:41 +01:00
TP Honey
771a3a6702 Merge pull request #253 from pmcmaw/rm_ubuntu
(MODULES-5501) - Remove unsupported Ubuntu
2017-08-17 16:00:54 +01:00
Paula McMaw
c74f533e0b (MODULES-5501) - Remove unsupported Ubuntu
Removing older version of Ubuntu that are not supported by the module.
2017-08-17 14:08:56 +01:00
Shaleen Gupta
43aa9af1b2 Add support for CloudLinux (#251)
Fix the fail "unsupported os CloudlLinux".
2017-08-01 13:30:38 +01:00
Paula McMaw
cceb78b7fe Merge pull request #252 from puppetlabs/maint-modsync-915cde70e20
(maint) modulesync 915cde70e20
2017-07-28 11:34:12 +01:00
Glenn Sarti
b50e762f1c (maint) modulesync 915cde70e20 2017-07-27 15:00:09 -07:00
Hunter Haugen
e9c50332bd Merge pull request #249 from puppetlabs/msync_modules5187
(MODULES-5187) msync puppet 5 and ruby 2.4
2017-07-10 14:51:42 -07:00
Eric Putnam
795b92a81d (MODULES-5187) mysnc puppet 5 and ruby 2.4 2017-07-06 14:41:47 -07:00
Glenn Sarti
31799ce4e7 Merge pull request #247 from hunner/bump_metadata
(MODULES-5144) Prep for puppet 5
2017-06-26 22:31:31 -07:00
Hunter Haugen
2829b75e83 (MODULES-5144) Prep for puppet 5 2017-06-26 14:12:02 -07:00
Bryan Jen
0ea0b663fa Merge pull request #246 from puppetlabs/release
2.1.0 mergeback
2017-06-22 16:30:00 -07:00
Glenn Sarti
e8808aca12 Merge pull request #245 from hunner/revert_3stuff
Revert "Release prep for 3.0.0"
2017-06-21 15:23:30 -07:00
Hunter Haugen
b410ac0882 Revert "Release prep for 3.0.0"
This reverts commit 15a208f3a5.
2017-06-21 15:16:31 -07:00
Hunter Haugen
6bbaacdb39 Merge pull request #244 from kBite/add-support-for-arch-linux
Add support for Archlinux
2017-06-21 14:29:25 -07:00
Kilian Engelhardt
6951263d4c fix indentation and remove a white line 2017-06-21 11:26:24 +02:00
Kilian Engelhardt
0bcdd2bc2f add basic arch linux support 2017-06-21 10:59:39 +02:00
Erick Banks
f80715ec6f Merge pull request #242 from hunner/add_url_hash_test
(maint) Add url_hash tests
2017-06-20 16:49:21 -07:00
Hunter Haugen
8458b03bb5 (maint) Add url_hash tests 2017-06-20 16:22:10 -07:00
Eric Putnam
ff33bcfa38 Merge pull request #240 from HelenCampbell/rpreppo
Release prep for 3.0.0
2017-06-15 16:03:40 -07:00
Helen Campbell
15a208f3a5 Release prep for 3.0.0 2017-06-15 17:14:13 +01:00
Paula McMaw
8763d0b388 Merge pull request #239 from puppetlabs/revert-238-release
Revert "Release Mergeback 2.1.0"
2017-06-15 11:20:16 +01:00
Helen
184c745e82 Revert "Release Mergeback 2.1.0" 2017-06-15 11:03:44 +01:00
Paula McMaw
9a209faa17 Merge pull request #238 from puppetlabs/release
Release Mergeback 2.1.0
2017-06-15 10:42:49 +01:00
Eric Putnam
b7085db8ae Merge pull request #237 from hunner/release_2.1.0
Release 2.1.0
2017-06-13 16:31:32 -07:00
Hunter Haugen
2c8b460b98 Release 2.1.0 2017-06-13 11:14:20 -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
Helen
73604a3419 Merge pull request #234 from spynappels/MODULES-5058
MODULES-5058 Allow a complete URL to be passed to the java::oracle class
2017-06-08 13:48:52 +01: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
Ben Ford
1af563c6d5 Merge pull request #223 from bastelfreak/puppet4
replace validate_* calls with datatypes & minor fixes
2017-06-07 15:02:15 -07:00
Tim Meusel
cf14116641 add datatypes for all parameters 2017-06-07 23:28:06 +02:00
Tim Meusel
3dacc7abe5 fix markdown linter warnings 2017-06-07 20:59:06 +02:00
Tim Meusel
66662bf4e9 replace validate_* calls with datatypes 2017-06-07 11:17:11 +02:00
Tim Meusel
585bd5795e bump stdlib to recommended puppet4 version 2017-06-07 11:17:08 +02:00
Tim Meusel
4f7d760f10 use proper syntax highlighting in markdown 2017-06-07 11:16:07 +02:00
Tim Meusel
920748cf0a purge trailing whitespace 2017-06-07 11:16:06 +02:00
Tim Meusel
75939fffc9 fix headlines in markdown 2017-06-07 11:15:37 +02:00
Glenn Sarti
de802e57bd Merge branch 'release'
* release:
  (maint) facts update oracle.pp
  (maint) update metadata
  fixed formatting errors + made various minor changes
  (MODULES-4958) prep for 2.0.0 release and some markdown rendering fixes
2017-05-30 16:27:35 -07:00
Hunter Haugen
3b45a95e50 Merge pull request #231 from eputnam/170prep
forgot to update version in metadata for major version bump

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 14:04:50 -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
Eric Putnam
3e284312b0 (maint) update metadata
forgot to update version in metadata for major version bump
2017-05-30 13:47:58 -07:00
Eric Putnam
c1a83674bd Merge pull request #230 from jbondpdx/release
fixed formatting errors + made various minor changes
2017-05-26 14:48:43 -07:00
jbondpdx
733fa45999 fixed formatting errors + made various minor changes 2017-05-26 13:45:13 -07:00
Hunter Haugen
3e16918284 Merge pull request #228 from eputnam/170prep 2017-05-24 15:29:39 -07:00
Eric Putnam
36b3de516f (MODULES-4958) prep for 2.0.0 release and some markdown rendering fixes 2017-05-24 15:11:55 -07:00
Eric Putnam
755aab753e Merge pull request #221 from traylenator/yakkety
Support for Ubuntu 16.10 - Yakkety Yak
2017-05-24 12:53:42 -07:00
Eric Putnam
beef56c294 Merge pull request #227 from chsnell/ticket/MODULES-4892-metadata_update
(MODULES-4892) Update metadata
2017-05-23 12:56:28 -07:00
Chris Snell
4fb2954ffe (MODULES-4829) puppethack - Correct link for issues_url 2017-05-23 14:49:27 -04:00
Eric Putnam
827a870a7c Merge pull request #226 from hlmartin/sles-openjdk-1.8
Update OpenJDK packages to 1.8.0 for SLES 12 service packs
2017-05-23 11:47:13 -07:00
Chris Snell
0b45946bd7 (MODULES-4892) Update metadata for new version requirement and update issues_url 2017-05-23 12:46:43 -04:00
Hailey Martin
b25212a04e Update OpenJDK packages to 1.8.0 for SLES 12 service packs 2017-05-15 20:37:26 +10:00
Hunter Haugen
fcf3ac3476 Merge pull request #225 from bstopp/bug/master/oracle-archive
(MODULES-4751) Fix Archive Order of Operations
2017-04-25 16:26:30 -07: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
Paula McMaw
ab6e3867fc Merge pull request #224 from vchepkov/java_version
[MODULES-4736] Increase Xmx setting for java_version fact
2017-04-19 13:53:35 +01: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
Paula McMaw
df1fbfd29d Merge pull request #222 from puppetlabs/modules-4506
[msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config
2017-04-03 13:38:18 +01:00
Wilson McCoubrey
a8448286f7 [maint] Fix puppet-lint warnings introduced with 2.2.0 puppet-lint release 2017-03-29 15:49:27 +01:00
Wilson McCoubrey
216620c90f [msync] 786266 Implement puppet-module-gems, a45803 Remove metadata.json from locales config 2017-03-29 13:55:50 +01:00
Steve Traylen
8627e7ddd4 Support for Ubuntu 16.10 - Yakkety Yak 2017-03-24 22:28:22 +01:00
Helen
32f4492828 Merge pull request #219 from puppetlabs/modules-4528
[MODULES-4528] Replace Puppet.version.to_f version comparison from spec_helper.rb
2017-03-24 11:35:20 +00:00
Wilson McCoubrey
c776023d56 [MODULES-4528] Replace Puppet.version.to_f version comparison from spec_helper.rb 2017-03-22 15:07:33 +00:00
Helen
a1e3695849 Merge pull request #218 from puppetlabs/MODULES-4556
[MODULES-4556] Remove PE requirement from metadata.json
2017-03-21 09:48:00 +00:00
Wilson McCoubrey
a5ba5b43cd [MODULES-4556] Remove PE requirement from metadata.json 2017-03-20 17:52:36 +00:00
Wilson McCoubrey
16e369ef21 Merge pull request #217 from traylenator/slc
Support SLC operatingsystem
2017-03-16 14:08:20 +00: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
Helen
ebb30f1ef5 Merge pull request #216 from tphoney/fix_oracle_spec
pinning to archive 1.2.0, for puppet 3 compat
2017-02-24 11:38:40 +00:00
tphoney
66c0d88026 pinning to archive 1.2.0, for puppet 3 compat 2017-02-24 11:20:59 +00:00
Jan Vansteenkiste
c0227ce820 MODULES-4368: return nil if java_bin is not found (readlink result is empty) 2017-02-01 08:10:59 +01:00
Jan Vansteenkiste
20960ddb7f MODULES-4368: Add a test case for the issue 2017-02-01 08:10:15 +01:00
Eric Putnam
6605e34d71 Merge pull request #212 from puppetlabs/hunner_msync
(MODULES-4098) Sync the rest of the files
2017-01-20 15:48:52 -08:00
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
Helen
9179d65d68 Merge pull request #186 from puppetlabs/update-modulesync
(MAINT) Update for modulesync_config 72d19f184
2016-07-29 15:03:04 +01:00
David Schmitt
b37d69c314 (MAINT) Update for modulesync_config 72d19f184 2016-07-27 15:43:59 +01:00
Hunter Haugen
47e567a94c Merge pull request #185 from LightAxe/master
Add support for Oracle Linux
2016-07-20 15:46:45 -07:00
RoboGi
9dbe1ce9bb Changed from operatingsystem to osfamily to match other RHEL derivitives such as Oracle Linux 2016-07-19 11:25:36 -07: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
TP Honey
71a8bed51d Merge pull request #183 from DavidS/modulesync
(MODULES-3581) modulesync [067d08a]
2016-07-11 09:22:13 +01:00
David Schmitt
19d44bb5cf (MODULES-3581) modulesync [067d08a] 2016-07-08 13:34:17 +01:00
Greg Hardy
5c2e3528bb Merge pull request #179 from puppetlabs/modulesync
{maint} modulesync 0794b2c
2016-06-30 15:45:09 +01:00
tphoney
c99b28bab0 {maint} modulesync 0794b2c 2016-06-30 14:38:10 +01:00
Hunter Haugen
a5c137d735 Merge pull request #177 from puppetlabs/release
1.6.0 Release mergeback
2016-06-13 16:17:02 -07:00
Helen
72a801c1e9 Merge pull request #176 from jbondpdx/release
minor edit on new text
2016-06-09 18:13:58 +01:00
jbondpdx
e038a13474 minor edit on new text 2016-06-09 09:59:13 -07:00
Hunter Haugen
ff158b6c68 Merge pull request #175 from HelenCampbell/release
1.6.0 Release Prep
2016-06-08 11:29:55 -07:00
Helen Campbell
addb6e0931 1.6.0 Release Prep 2016-06-08 19:27:51 +01:00
David Schmitt
124abf1278 Merge pull request #173 from edge-records/patch-1
custom archive type needs extract_path
2016-05-26 12:28:09 +01:00
David Schmitt
a45aee2567 Merge pull request #174 from edge-records/patch-2
Also support RedHat for Oracle Java
2016-05-26 12:27:47 +01:00
edge-records
a74be5a7f8 Also support RedHat for Oracle Java
Works fine for me, tested on RHEL6.
2016-05-25 11:00:29 +01:00
edge-records
4f700ca1e3 custom archive type needs extract_path
archive type's extract_path doesn't have a default parameter and needs to be set (see https://github.com/voxpupuli/puppet-archive/blob/master/lib/puppet/type/archive.rb#L71-L78). If I don't set one I get the following error when trying to use this module:

Error: Failed to apply catalog: No title provided and :file is not a valid resource reference
2016-05-25 10:58:02 +01:00
JT (Jonny)
519e2d7b77 Merge pull request #171 from jonnytpuppet/tylerjl/sles-11.4-java
Update java package for SLES 11.4
2016-05-10 11:33:44 +01: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
Bryan Jen
f4d218a162 Merge pull request #170 from gerhardsam/fix_doc_typo
Fix typo in documentation for class oracle
2016-05-04 09:56:37 -07:00
Sebastian Gerhards
3d8d4d76e0 Fix typo in documentation for class oracle 2016-05-02 15:08:51 +02:00
Greg Hardy
829b8d6448 Merge pull request #169 from puppetlabs/update-msync
Update to newest modulesync_configs [9ca280f]
2016-04-19 11:30:59 +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
TP Honey
3fa562a033 Merge pull request #166 from alexharv074/fix_rspec_deprecation_warnings
Fix up rspec deprecation warnings.
2016-04-13 07:42:54 +01:00
tphoney
b9a864e313 (maint) fix test to run under strict variables 2016-04-13 06:55:17 +01:00
Hunter Haugen
bc8bed2c65 Merge pull request #167 from puppetlabs/1.5.x
1.5.x mergeback
2016-04-12 14:48:03 -07:00
Alex Harvey
4775718a2f Fix up rspec deprecation warnings. 2016-04-12 22:52:51 +10:00
TP Honey
1165f3aaa2 Merge pull request #165 from alexharv074/fix_typo_in_readme
Fix typo in README.markdown
2016-04-11 16:57:57 +01:00
Alex Harvey
3f2825c5e2 Fix typo in README.markdown 2016-04-09 22:53:20 +10:00
David Schmitt
8e0c06cba9 Merge pull request #164 from s12v/master
Add Ubuntu 16.04
2016-04-04 14:27:13 +01:00
David Schmitt
0e47d95a71 Merge pull request #162 from npwalker/add_example_for_java_8
Add an example for installing java 8
2016-04-04 14:26:42 +01:00
Bryan Jen
9d43ed058e Merge pull request #163 from HelenCampbell/1.5.0
Release prep for 1.5.0
2016-03-31 09:38:54 -07:00
Sergey Novikov
afcb95b10b Add Ubuntu 16.04 2016-03-31 18:30:26 +02:00
Helen Campbell
15aff36b79 Release prep for 1.5.0 2016-03-31 17:21:59 +01:00
Nick Walker
7ab4bc1b37 Add an example for installing java 8
Prior to this commit, the documentation was lacking an example of how to install a specific version of java.  Which led users to believe that they should use the version parameter.  

After this commit, we have an example showing the correct way to install a different major verison of java is to use the package parameter.
2016-03-29 07:40:46 -07: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
Marseglia. Mike
2bc036e043 fix syntax error in metadata.json 2016-02-26 11:47:16 -05:00
Marseglia. Mike
07767f0c8d update README with java::oracle usage, notes. removed puppet/archive as dependency since it is only required for java::oracle. 2016-02-26 11:18:46 -05:00
Hunter Haugen
b2c073e651 Merge pull request #160 from jyaworski/rhel71_java8
Use java 8 as the default on RHEL > 7.0
2016-02-24 10:55:54 -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
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
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
96 changed files with 6744 additions and 1527 deletions

6
.devcontainer/Dockerfile Normal file
View File

@@ -0,0 +1,6 @@
FROM puppet/pdk:latest
# [Optional] Uncomment this section to install additional packages.
# RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
# && apt-get -y install --no-install-recommends <your-package-list-here>

34
.devcontainer/README.md Normal file
View File

@@ -0,0 +1,34 @@
# devcontainer
For format details, see https://aka.ms/devcontainer.json.
For config options, see the README at:
https://github.com/microsoft/vscode-dev-containers/tree/v0.140.1/containers/puppet
``` json
{
"name": "Puppet Development Kit (Community)",
"dockerFile": "Dockerfile",
// Set *default* container specific settings.json values on container create.
"settings": {
"terminal.integrated.shell.linux": "/bin/bash"
},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"puppet.puppet-vscode",
"rebornix.Ruby"
]
// Use 'forwardPorts' to make a list of ports inside the container available locally.
"forwardPorts": [],
// Use 'postCreateCommand' to run commands after the container is created.
"postCreateCommand": "pdk --version",
}
```

View File

@@ -0,0 +1,17 @@
{
"name": "Puppet Development Kit (Community)",
"dockerFile": "Dockerfile",
"settings": {
"terminal.integrated.profiles.linux": {
"bash": {
"path": "bash",
}
}
},
"extensions": [
"puppet.puppet-vscode",
"rebornix.Ruby"
]
}

View File

@@ -1,5 +1,9 @@
fixtures: fixtures:
repositories: repositories:
stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git" archive: "https://github.com/voxpupuli/puppet-archive.git"
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
provision: 'https://github.com/puppetlabs/provision.git'
symlinks: symlinks:
java: "#{source_dir}" java: "#{source_dir}"

5
.gitattributes vendored Normal file
View File

@@ -0,0 +1,5 @@
*.rb eol=lf
*.erb eol=lf
*.pp eol=lf
*.sh eol=lf
*.epp eol=lf

90
.github/workflows/auto_release.yml vendored Normal file
View File

@@ -0,0 +1,90 @@
name: "Auto release"
on:
workflow_dispatch:
env:
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
HONEYCOMB_DATASET: litmus tests
CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
jobs:
auto_release:
name: "Automatic release prep"
runs-on: ubuntu-20.04
steps:
- name: "Honeycomb: Start recording"
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
job-status: ${{ job.status }}
- name: "Honeycomb: start first step"
run: |
echo STEP_ID="auto-release" >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: "Checkout Source"
if: ${{ github.repository_owner == 'puppetlabs' }}
uses: actions/checkout@v2
with:
fetch-depth: 0
persist-credentials: false
- name: "PDK Release prep"
uses: docker://puppet/iac_release:ci
with:
args: 'release prep --force'
env:
CHANGELOG_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- name: "Get Version"
if: ${{ github.repository_owner == 'puppetlabs' }}
id: gv
run: |
echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
- name: "Check if a release is necessary"
if: ${{ github.repository_owner == 'puppetlabs' }}
id: check
run: |
git diff --quiet CHANGELOG.md && echo "::set-output name=release::false" || echo "::set-output name=release::true"
- name: "Commit changes"
if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
run: |
git config --local user.email "${{ github.repository_owner }}@users.noreply.github.com"
git config --local user.name "GitHub Action"
git add .
git commit -m "Release prep v${{ steps.gv.outputs.ver }}"
- name: Create Pull Request
id: cpr
uses: puppetlabs/peter-evans-create-pull-request@v3
if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "Release prep v${{ steps.gv.outputs.ver }}"
branch: "release-prep"
delete-branch: true
title: "Release prep v${{ steps.gv.outputs.ver }}"
body: |
Automated release-prep through [pdk-templates](https://github.com/puppetlabs/pdk-templates/blob/main/moduleroot/.github/workflows/auto_release.yml.erb) from commit ${{ github.sha }}.
Please verify before merging:
- [ ] last [nightly](https://github.com/${{ github.repository }}/actions/workflows/nightly.yml) run is green
- [ ] [Changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) is readable and has no unlabeled pull requests
- [ ] Ensure the [changelog](https://github.com/${{ github.repository }}/blob/release-prep/CHANGELOG.md) version and [metadata](https://github.com/${{ github.repository }}/blob/release-prep/metadata.json) version match
labels: "maintenance"
- name: PR outputs
if: ${{ github.repository_owner == 'puppetlabs' && steps.check.outputs.release == 'true' }}
run: |
echo "Pull Request Number - ${{ steps.cpr.outputs.pull-request-number }}"
echo "Pull Request URL - ${{ steps.cpr.outputs.pull-request-url }}"
- name: "Honeycomb: Record finish step"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Finished auto release workflow'

22
.github/workflows/labeller.yml vendored Normal file
View File

@@ -0,0 +1,22 @@
name: community-labeller
on:
issues:
types:
- opened
pull_request_target:
types:
- opened
jobs:
label:
runs-on: ubuntu-latest
steps:
- uses: puppetlabs/community-labeller@v0
name: Label issues or pull requests
with:
label_name: community
label_color: '5319e7'
org_membership: puppetlabs
token: ${{ secrets.IAC_COMMUNITY_LABELER }}

204
.github/workflows/nightly.yml vendored Normal file
View File

@@ -0,0 +1,204 @@
name: "nightly"
on:
schedule:
- cron: '0 0 * * *'
env:
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
HONEYCOMB_DATASET: litmus tests
jobs:
setup_matrix:
if: ${{ github.repository_owner == 'puppetlabs' }}
name: "Setup Test Matrix"
runs-on: ubuntu-20.04
outputs:
matrix: ${{ steps.get-matrix.outputs.matrix }}
steps:
- name: "Honeycomb: Start recording"
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
job-status: ${{ job.status }}
- name: "Honeycomb: Start first step"
run: |
echo STEP_ID=setup-environment >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
uses: actions/checkout@v2
if: ${{ github.repository_owner == 'puppetlabs' }}
- name: Activate Ruby 2.7
uses: ruby/setup-ruby@v1
if: ${{ github.repository_owner == 'puppetlabs' }}
with:
ruby-version: "2.7"
bundler-cache: true
- name: Print bundle environment
if: ${{ github.repository_owner == 'puppetlabs' }}
run: |
echo ::group::bundler environment
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
echo ::endgroup::
- name: "Honeycomb: Record Setup Environment time"
if: ${{ github.repository_owner == 'puppetlabs' }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Setup Acceptance Test Matrix
id: get-matrix
if: ${{ github.repository_owner == 'puppetlabs' }}
run: |
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
else
echo "::set-output name=matrix::{}"
fi
- name: "Honeycomb: Record Setup Test Matrix time"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
Acceptance:
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
needs:
- setup_matrix
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
env:
BUILDEVENT_FILE: '../buildevents.txt'
steps:
- run: |
echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
- name: "Honeycomb: Start recording"
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
job-status: ${{ job.status }}
matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
- name: "Honeycomb: start first step"
run: |
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
uses: actions/checkout@v2
- name: Activate Ruby 2.7
uses: ruby/setup-ruby@v1
with:
ruby-version: "2.7"
bundler-cache: true
- name: Print bundle environment
run: |
echo ::group::bundler environment
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
echo ::endgroup::
- name: "Honeycomb: Record Setup Environment time"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Provision test environment
run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
echo ::group::=== REQUEST ===
cat request.json || true
echo
echo ::endgroup::
echo ::group::=== INVENTORY ===
if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
then
FILE='spec/fixtures/litmus_inventory.yaml'
elif [ -f 'inventory.yaml' ];
then
FILE='inventory.yaml'
fi
sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
echo ::endgroup::
- name: Install agent
run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
- name: Install module
run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
- name: "Honeycomb: Record deployment times"
if: ${{ always() }}
run: |
echo ::group::honeycomb step
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
echo ::endgroup::
- name: Run acceptance tests
run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
- name: "Honeycomb: Record acceptance testing times"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Remove test environment
if: ${{ always() }}
continue-on-error: true
run: |
if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
echo ::group::=== REQUEST ===
cat request.json || true
echo
echo ::endgroup::
fi
- name: "Honeycomb: Record removal times"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'
slack-workflow-status:
if: ${{ github.repository_owner == 'puppetlabs' }}
name: Post Workflow Status To Slack
needs:
- Acceptance
runs-on: ubuntu-20.04
steps:
- name: Slack Workflow Notification
uses: puppetlabs/Gamesight-slack-workflow-status@pdk-templates-v1
with:
# Required Input
repo_token: ${{ secrets.GITHUB_TOKEN }}
slack_webhook_url: ${{ secrets.SLACK_WEBHOOK }}
# Optional Input
channel: '#team-ia-bots'
name: 'GABot'

185
.github/workflows/pr_test.yml vendored Normal file
View File

@@ -0,0 +1,185 @@
name: "PR Testing"
on: [pull_request]
env:
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
HONEYCOMB_DATASET: litmus tests
jobs:
setup_matrix:
name: "Setup Test Matrix"
runs-on: ubuntu-20.04
outputs:
matrix: ${{ steps.get-matrix.outputs.matrix }}
steps:
- name: "Honeycomb: Start recording"
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
job-status: ${{ job.status }}
- name: "Honeycomb: Start first step"
run: |
echo STEP_ID=setup-environment >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
uses: actions/checkout@v2
if: ${{ github.repository_owner == 'puppetlabs' }}
- name: Activate Ruby 2.7
uses: ruby/setup-ruby@v1
if: ${{ github.repository_owner == 'puppetlabs' }}
with:
ruby-version: "2.7"
bundler-cache: true
- name: Print bundle environment
if: ${{ github.repository_owner == 'puppetlabs' }}
run: |
echo ::group::bundler environment
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
echo ::endgroup::
- name: "Honeycomb: Record Setup Environment time"
if: ${{ github.repository_owner == 'puppetlabs' }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Run validation steps
run: |
bundle exec rake validate
if: ${{ github.repository_owner == 'puppetlabs' }}
- name: Setup Acceptance Test Matrix
id: get-matrix
run: |
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
else
echo "::set-output name=matrix::{}"
fi
- name: "Honeycomb: Record Setup Test Matrix time"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
Acceptance:
name: "${{matrix.platforms.label}}, ${{matrix.collection}}"
needs:
- setup_matrix
if: ${{ needs.setup_matrix.outputs.matrix != '{}' }}
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix: ${{fromJson(needs.setup_matrix.outputs.matrix)}}
env:
BUILDEVENT_FILE: '../buildevents.txt'
steps:
- run: |
echo 'platform=${{ matrix.platforms.image }}' >> $BUILDEVENT_FILE
echo 'collection=${{ matrix.collection }}' >> $BUILDEVENT_FILE
echo 'label=${{ matrix.platforms.label }}' >> $BUILDEVENT_FILE
- name: "Honeycomb: Start recording"
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
job-status: ${{ job.status }}
matrix-key: ${{ matrix.platforms.label }}-${{ matrix.collection }}
- name: "Honeycomb: start first step"
run: |
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-1 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
uses: actions/checkout@v2
- name: Activate Ruby 2.7
uses: ruby/setup-ruby@v1
with:
ruby-version: "2.7"
bundler-cache: true
- name: Print bundle environment
run: |
echo ::group::bundler environment
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
echo ::endgroup::
- name: "Honeycomb: Record Setup Environment time"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-2 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Provision test environment
run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:provision ${{ matrix.platforms.image }}' -- bundle exec rake 'litmus:provision[${{matrix.platforms.provider}},${{ matrix.platforms.image }}]'
echo ::group::=== REQUEST ===
cat request.json || true
echo
echo ::endgroup::
echo ::group::=== INVENTORY ===
if [ -f 'spec/fixtures/litmus_inventory.yaml' ];
then
FILE='spec/fixtures/litmus_inventory.yaml'
elif [ -f 'inventory.yaml' ];
then
FILE='inventory.yaml'
fi
sed -e 's/password: .*/password: "[redacted]"/' < $FILE || true
echo ::endgroup::
- name: Install agent
run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_agent ${{ matrix.collection }}' -- bundle exec rake 'litmus:install_agent[${{ matrix.collection }}]'
- name: Install module
run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:install_module' -- bundle exec rake 'litmus:install_module'
- name: "Honeycomb: Record deployment times"
if: ${{ always() }}
run: |
echo ::group::honeycomb step
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Deploy test system'
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-3 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
echo ::endgroup::
- name: Run acceptance tests
run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:acceptance:parallel' -- bundle exec rake 'litmus:acceptance:parallel'
- name: "Honeycomb: Record acceptance testing times"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Run acceptance tests'
echo STEP_ID=${{ matrix.platforms.image }}-${{ matrix.collection }}-4 >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Remove test environment
if: ${{ always() }}
continue-on-error: true
run: |
if [[ -f inventory.yaml || -f spec/fixtures/litmus_inventory.yaml ]]; then
buildevents cmd $TRACE_ID $STEP_ID 'rake litmus:tear_down' -- bundle exec rake 'litmus:tear_down'
echo ::group::=== REQUEST ===
cat request.json || true
echo
echo ::endgroup::
fi
- name: "Honeycomb: Record removal times"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Remove test environment'

47
.github/workflows/release.yml vendored Normal file
View File

@@ -0,0 +1,47 @@
name: "Publish module"
on:
workflow_dispatch:
jobs:
create-github-release:
name: Deploy GitHub Release
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
ref: ${{ github.ref }}
clean: true
fetch-depth: 0
- name: Get Version
id: gv
run: |
echo "::set-output name=ver::$(jq --raw-output .version metadata.json)"
- name: Create Release
uses: actions/create-release@v1
id: create_release
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: "v${{ steps.gv.outputs.ver }}"
draft: false
prerelease: false
deploy-forge:
name: Deploy to Forge
runs-on: ubuntu-20.04
steps:
- name: Checkout code
uses: actions/checkout@v2
with:
ref: ${{ github.ref }}
clean: true
- name: "PDK Build"
uses: docker://puppet/pdk:nightly
with:
args: 'build'
- name: "Push to Forge"
uses: docker://puppet/pdk:nightly
with:
args: 'release publish --forge-token ${{ secrets.FORGE_API_KEY }} --force'

126
.github/workflows/spec.yml vendored Normal file
View File

@@ -0,0 +1,126 @@
name: "Spec Tests"
on:
schedule:
- cron: '0 0 * * *'
workflow_dispatch:
pull_request:
env:
HONEYCOMB_WRITEKEY: 7f3c63a70eecc61d635917de46bea4e6
HONEYCOMB_DATASET: litmus tests
jobs:
setup_matrix:
name: "Setup Test Matrix"
runs-on: ubuntu-20.04
outputs:
spec_matrix: ${{ steps.get-matrix.outputs.spec_matrix }}
steps:
- name: "Honeycomb: Start recording"
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
job-status: ${{ job.status }}
- name: "Honeycomb: Start first step"
run: |
echo STEP_ID=setup-environment >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: Checkout Source
uses: actions/checkout@v2
if: ${{ github.repository_owner == 'puppetlabs' }}
- name: Activate Ruby 2.7
uses: ruby/setup-ruby@v1
if: ${{ github.repository_owner == 'puppetlabs' }}
with:
ruby-version: "2.7"
bundler-cache: true
- name: Print bundle environment
if: ${{ github.repository_owner == 'puppetlabs' }}
run: |
echo ::group::bundler environment
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
echo ::endgroup::
- name: "Honeycomb: Record Setup Environment time"
if: ${{ github.repository_owner == 'puppetlabs' }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Environment'
echo STEP_ID=Setup-Acceptance-Test-Matrix >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
# - name: Run Static & Syntax Tests
# if: ${{ github.repository_owner == 'puppetlabs' }}
# run: |
# buildevents cmd $TRACE_ID $STEP_ID 'static_syntax_checks' -- bundle exec rake syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop
- name: Setup Spec Test Matrix
id: get-matrix
run: |
if [ '${{ github.repository_owner }}' == 'puppetlabs' ]; then
buildevents cmd $TRACE_ID $STEP_ID matrix_from_metadata -- bundle exec matrix_from_metadata_v2
else
echo "::set-output name=spec_matrix::{}"
fi
- name: "Honeycomb: Record Setup Test Matrix time"
if: ${{ always() }}
run: |
buildevents step $TRACE_ID $STEP_ID $STEP_START 'Setup Test Matrix'
Spec:
name: "Spec Tests (Puppet: ${{matrix.puppet_version}}, Ruby Ver: ${{matrix.ruby_version}})"
needs:
- setup_matrix
if: ${{ needs.setup_matrix.outputs.spec_matrix != '{}' }}
runs-on: ubuntu-20.04
strategy:
fail-fast: false
matrix: ${{fromJson(needs.setup_matrix.outputs.spec_matrix)}}
env:
BUILDEVENT_FILE: '../buildevents.txt'
PUPPET_GEM_VERSION: ${{ matrix.puppet_version }}
FACTER_GEM_VERSION: 'https://github.com/puppetlabs/facter#main'
steps:
- run: |
echo "SANITIZED_PUPPET_VERSION=$(echo '${{ matrix.puppet_version }}' | sed 's/~> //g')" >> $GITHUB_ENV
- run: |
echo 'puppet_version=${{ env.SANITIZED_PUPPET_VERSION }}' >> $BUILDEVENT_FILE
- name: "Honeycomb: Start first step"
run: |
echo "STEP_ID=${{ env.SANITIZED_PUPPET_VERSION }}-spec" >> $GITHUB_ENV
echo STEP_START=$(date +%s) >> $GITHUB_ENV
- name: "Honeycomb: Start recording"
uses: puppetlabs/kvrhdn-gha-buildevents@pdk-templates-v1
with:
apikey: ${{ env.HONEYCOMB_WRITEKEY }}
dataset: ${{ env.HONEYCOMB_DATASET }}
job-status: ${{ job.status }}
matrix-key: ${{ env.SANITIZED_PUPPET_VERSION }}
- name: Checkout Source
uses: actions/checkout@v2
- name: "Activate Ruby ${{ matrix.ruby_version }}"
uses: ruby/setup-ruby@v1
with:
ruby-version: ${{matrix.ruby_version}}
bundler-cache: true
- name: Print bundle environment
run: |
echo ::group::bundler environment
buildevents cmd $TRACE_ID $STEP_ID 'bundle env' -- bundle env
echo ::endgroup::
- name: Run parallel_spec tests
run: |
buildevents cmd $TRACE_ID $STEP_ID 'rake parallel_spec Puppet ${{ matrix.puppet_version }}, Ruby ${{ matrix.ruby_version }}' -- bundle exec rake parallel_spec

19
.github/workflows/stale.yml vendored Normal file
View File

@@ -0,0 +1,19 @@
name: Mark stale issues and pull requests
on:
schedule:
- cron: "30 1 * * *"
jobs:
stale:
runs-on: ubuntu-latest
steps:
- uses: actions/stale@v3
with:
repo-token: ${{ secrets.GITHUB_TOKEN }}
days-before-stale: 60
days-before-close: 7
stale-issue-message: 'This issue has been marked as stale because it has been open for a while and has had no recent activity. If this issue is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
stale-issue-label: 'stale'
stale-pr-message: 'This PR has been marked as stale because it has been open for a while and has had no recent activity. If this PR is still important to you please drop a comment below and we will add this to our backlog to complete. Otherwise, it will be closed in 7 days.'
stale-pr-label: 'stale'

35
.gitignore vendored
View File

@@ -1,9 +1,28 @@
pkg/ .git/
Gemfile.lock .*.sw[op]
vendor/ .metadata
spec/fixtures/ .yardoc
.vagrant/ .yardwarns
.bundle/
coverage/
.idea/
*.iml *.iml
/.bundle/
/.idea/
/.vagrant/
/coverage/
/bin/
/doc/
/Gemfile.local
/Gemfile.lock
/junit/
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml

18
.gitpod.Dockerfile vendored Normal file
View File

@@ -0,0 +1,18 @@
FROM gitpod/workspace-full
RUN sudo wget https://apt.puppet.com/puppet-tools-release-bionic.deb && \
wget https://apt.puppetlabs.com/puppet6-release-bionic.deb && \
sudo dpkg -i puppet6-release-bionic.deb && \
sudo dpkg -i puppet-tools-release-bionic.deb && \
sudo apt-get update && \
sudo apt-get install -y pdk zsh puppet-agent && \
sudo apt-get clean && \
sudo rm -rf /var/lib/apt/lists/*
RUN sudo usermod -s $(which zsh) gitpod && \
sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" && \
echo "plugins=(git gitignore github gem pip bundler python ruby docker docker-compose)" >> /home/gitpod/.zshrc && \
echo 'PATH="$PATH:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/opt/puppetlabs/bin:/opt/puppetlabs/puppet/bin"' >> /home/gitpod/.zshrc && \
sudo /opt/puppetlabs/puppet/bin/gem install puppet-debugger hub -N && \
mkdir -p /home/gitpod/.config/puppet && \
/opt/puppetlabs/puppet/bin/ruby -r yaml -e "puts ({'disabled' => true}).to_yaml" > /home/gitpod/.config/puppet/analytics.yml
RUN rm -f puppet6-release-bionic.deb puppet-tools-release-bionic.deb
ENTRYPOINT /usr/bin/zsh

9
.gitpod.yml Normal file
View File

@@ -0,0 +1,9 @@
image:
file: .gitpod.Dockerfile
tasks:
- init: pdk bundle install
vscode:
extensions:
- puppet.puppet-vscode@1.2.0:f5iEPbmOj6FoFTOV6q8LTg==

47
.pdkignore Normal file
View File

@@ -0,0 +1,47 @@
.git/
.*.sw[op]
.metadata
.yardoc
.yardwarns
*.iml
/.bundle/
/.idea/
/.vagrant/
/coverage/
/bin/
/doc/
/Gemfile.local
/Gemfile.lock
/junit/
/log/
/pkg/
/spec/fixtures/manifests/
/spec/fixtures/modules/
/tmp/
/vendor/
/convert_report.txt
/update_report.txt
.DS_Store
.project
.envrc
/inventory.yaml
/spec/fixtures/litmus_inventory.yaml
/appveyor.yml
/.editorconfig
/.fixtures.yml
/Gemfile
/.gitattributes
/.gitignore
/.gitlab-ci.yml
/.pdkignore
/.puppet-lint.rc
/Rakefile
/rakelib/
/.rspec
/.rubocop.yml
/.travis.yml
/.yardopts
/spec/
/.vscode/
/.sync.yml
/.devcontainer/

1
.puppet-lint.rc Normal file
View File

@@ -0,0 +1 @@
--relative

2
.rspec Normal file
View File

@@ -0,0 +1,2 @@
--color
--format documentation

519
.rubocop.yml Normal file
View File

@@ -0,0 +1,519 @@
---
require:
- rubocop-performance
- rubocop-rspec
AllCops:
DisplayCopNames: true
TargetRubyVersion: '2.5'
Include:
- "**/*.rb"
Exclude:
- bin/*
- ".vendor/**/*"
- "**/Gemfile"
- "**/Rakefile"
- pkg/**/*
- spec/fixtures/**/*
- vendor/**/*
- "**/Puppetfile"
- "**/Vagrantfile"
- "**/Guardfile"
Layout/LineLength:
Description: People have wide screens, use them.
Max: 200
RSpec/BeforeAfterAll:
Description: Beware of using after(:all) as it may cause state to leak between tests.
A necessary evil in acceptance testing.
Exclude:
- spec/acceptance/**/*.rb
RSpec/HookArgument:
Description: Prefer explicit :each argument, matching existing module's style
EnforcedStyle: each
RSpec/DescribeSymbol:
Exclude:
- spec/unit/facter/**/*.rb
Style/BlockDelimiters:
Description: Prefer braces for chaining. Mostly an aesthetical choice. Better to
be consistent then.
EnforcedStyle: braces_for_chaining
Style/ClassAndModuleChildren:
Description: Compact style reduces the required amount of indentation.
EnforcedStyle: compact
Style/EmptyElse:
Description: Enforce against empty else clauses, but allow `nil` for clarity.
EnforcedStyle: empty
Style/FormatString:
Description: Following the main puppet project's style, prefer the % format format.
EnforcedStyle: percent
Style/FormatStringToken:
Description: Following the main puppet project's style, prefer the simpler template
tokens over annotated ones.
EnforcedStyle: template
Style/Lambda:
Description: Prefer the keyword for easier discoverability.
EnforcedStyle: literal
Style/RegexpLiteral:
Description: Community preference. See https://github.com/voxpupuli/modulesync_config/issues/168
EnforcedStyle: percent_r
Style/TernaryParentheses:
Description: Checks for use of parentheses around ternary conditions. Enforce parentheses
on complex expressions for better readability, but seriously consider breaking
it up.
EnforcedStyle: require_parentheses_when_complex
Style/TrailingCommaInArguments:
Description: Prefer always trailing comma on multiline argument lists. This makes
diffs, and re-ordering nicer.
EnforcedStyleForMultiline: comma
Style/TrailingCommaInArrayLiteral:
Description: Prefer always trailing comma on multiline literals. This makes diffs,
and re-ordering nicer.
EnforcedStyleForMultiline: comma
Style/SymbolArray:
Description: Using percent style obscures symbolic intent of array's contents.
EnforcedStyle: brackets
RSpec/MessageSpies:
EnforcedStyle: receive
Style/Documentation:
Exclude:
- lib/puppet/parser/functions/**/*
- spec/**/*
Style/WordArray:
EnforcedStyle: brackets
Performance/AncestorsInclude:
Enabled: true
Performance/BigDecimalWithNumericArgument:
Enabled: true
Performance/BlockGivenWithExplicitBlock:
Enabled: true
Performance/CaseWhenSplat:
Enabled: true
Performance/ConstantRegexp:
Enabled: true
Performance/MethodObjectAsBlock:
Enabled: true
Performance/RedundantSortBlock:
Enabled: true
Performance/RedundantStringChars:
Enabled: true
Performance/ReverseFirst:
Enabled: true
Performance/SortReverse:
Enabled: true
Performance/Squeeze:
Enabled: true
Performance/StringInclude:
Enabled: true
Performance/Sum:
Enabled: true
Style/CollectionMethods:
Enabled: true
Style/MethodCalledOnDoEndBlock:
Enabled: true
Style/StringMethods:
Enabled: true
Bundler/InsecureProtocolSource:
Enabled: false
Gemspec/DuplicatedAssignment:
Enabled: false
Gemspec/OrderedDependencies:
Enabled: false
Gemspec/RequiredRubyVersion:
Enabled: false
Gemspec/RubyVersionGlobalsUsage:
Enabled: false
Layout/ArgumentAlignment:
Enabled: false
Layout/BeginEndAlignment:
Enabled: false
Layout/ClosingHeredocIndentation:
Enabled: false
Layout/EmptyComment:
Enabled: false
Layout/EmptyLineAfterGuardClause:
Enabled: false
Layout/EmptyLinesAroundArguments:
Enabled: false
Layout/EmptyLinesAroundAttributeAccessor:
Enabled: false
Layout/EndOfLine:
Enabled: false
Layout/FirstArgumentIndentation:
Enabled: false
Layout/HashAlignment:
Enabled: false
Layout/HeredocIndentation:
Enabled: false
Layout/LeadingEmptyLines:
Enabled: false
Layout/SpaceAroundMethodCallOperator:
Enabled: false
Layout/SpaceInsideArrayLiteralBrackets:
Enabled: false
Layout/SpaceInsideReferenceBrackets:
Enabled: false
Lint/BigDecimalNew:
Enabled: false
Lint/BooleanSymbol:
Enabled: false
Lint/ConstantDefinitionInBlock:
Enabled: false
Lint/DeprecatedOpenSSLConstant:
Enabled: false
Lint/DisjunctiveAssignmentInConstructor:
Enabled: false
Lint/DuplicateElsifCondition:
Enabled: false
Lint/DuplicateRequire:
Enabled: false
Lint/DuplicateRescueException:
Enabled: false
Lint/EmptyConditionalBody:
Enabled: false
Lint/EmptyFile:
Enabled: false
Lint/ErbNewArguments:
Enabled: false
Lint/FloatComparison:
Enabled: false
Lint/HashCompareByIdentity:
Enabled: false
Lint/IdentityComparison:
Enabled: false
Lint/InterpolationCheck:
Enabled: false
Lint/MissingCopEnableDirective:
Enabled: false
Lint/MixedRegexpCaptureTypes:
Enabled: false
Lint/NestedPercentLiteral:
Enabled: false
Lint/NonDeterministicRequireOrder:
Enabled: false
Lint/OrderedMagicComments:
Enabled: false
Lint/OutOfRangeRegexpRef:
Enabled: false
Lint/RaiseException:
Enabled: false
Lint/RedundantCopEnableDirective:
Enabled: false
Lint/RedundantRequireStatement:
Enabled: false
Lint/RedundantSafeNavigation:
Enabled: false
Lint/RedundantWithIndex:
Enabled: false
Lint/RedundantWithObject:
Enabled: false
Lint/RegexpAsCondition:
Enabled: false
Lint/ReturnInVoidContext:
Enabled: false
Lint/SafeNavigationConsistency:
Enabled: false
Lint/SafeNavigationWithEmpty:
Enabled: false
Lint/SelfAssignment:
Enabled: false
Lint/SendWithMixinArgument:
Enabled: false
Lint/ShadowedArgument:
Enabled: false
Lint/StructNewOverride:
Enabled: false
Lint/ToJSON:
Enabled: false
Lint/TopLevelReturnWithArgument:
Enabled: false
Lint/TrailingCommaInAttributeDeclaration:
Enabled: false
Lint/UnreachableLoop:
Enabled: false
Lint/UriEscapeUnescape:
Enabled: false
Lint/UriRegexp:
Enabled: false
Lint/UselessMethodDefinition:
Enabled: false
Lint/UselessTimes:
Enabled: false
Metrics/AbcSize:
Enabled: false
Metrics/BlockLength:
Enabled: false
Metrics/BlockNesting:
Enabled: false
Metrics/ClassLength:
Enabled: false
Metrics/CyclomaticComplexity:
Enabled: false
Metrics/MethodLength:
Enabled: false
Metrics/ModuleLength:
Enabled: false
Metrics/ParameterLists:
Enabled: false
Metrics/PerceivedComplexity:
Enabled: false
Migration/DepartmentName:
Enabled: false
Naming/AccessorMethodName:
Enabled: false
Naming/BlockParameterName:
Enabled: false
Naming/HeredocDelimiterCase:
Enabled: false
Naming/HeredocDelimiterNaming:
Enabled: false
Naming/MemoizedInstanceVariableName:
Enabled: false
Naming/MethodParameterName:
Enabled: false
Naming/RescuedExceptionsVariableName:
Enabled: false
Naming/VariableNumber:
Enabled: false
Performance/BindCall:
Enabled: false
Performance/DeletePrefix:
Enabled: false
Performance/DeleteSuffix:
Enabled: false
Performance/InefficientHashSearch:
Enabled: false
Performance/UnfreezeString:
Enabled: false
Performance/UriDefaultParser:
Enabled: false
RSpec/Be:
Enabled: false
RSpec/Capybara/CurrentPathExpectation:
Enabled: false
RSpec/Capybara/FeatureMethods:
Enabled: false
RSpec/Capybara/VisibilityMatcher:
Enabled: false
RSpec/ContextMethod:
Enabled: false
RSpec/ContextWording:
Enabled: false
RSpec/DescribeClass:
Enabled: false
RSpec/EmptyHook:
Enabled: false
RSpec/EmptyLineAfterExample:
Enabled: false
RSpec/EmptyLineAfterExampleGroup:
Enabled: false
RSpec/EmptyLineAfterHook:
Enabled: false
RSpec/ExampleLength:
Enabled: false
RSpec/ExampleWithoutDescription:
Enabled: false
RSpec/ExpectChange:
Enabled: false
RSpec/ExpectInHook:
Enabled: false
RSpec/FactoryBot/AttributeDefinedStatically:
Enabled: false
RSpec/FactoryBot/CreateList:
Enabled: false
RSpec/FactoryBot/FactoryClassName:
Enabled: false
RSpec/HooksBeforeExamples:
Enabled: false
RSpec/ImplicitBlockExpectation:
Enabled: false
RSpec/ImplicitSubject:
Enabled: false
RSpec/LeakyConstantDeclaration:
Enabled: false
RSpec/LetBeforeExamples:
Enabled: false
RSpec/MissingExampleGroupArgument:
Enabled: false
RSpec/MultipleExpectations:
Enabled: false
RSpec/MultipleMemoizedHelpers:
Enabled: false
RSpec/MultipleSubjects:
Enabled: false
RSpec/NestedGroups:
Enabled: false
RSpec/PredicateMatcher:
Enabled: false
RSpec/ReceiveCounts:
Enabled: false
RSpec/ReceiveNever:
Enabled: false
RSpec/RepeatedExampleGroupBody:
Enabled: false
RSpec/RepeatedExampleGroupDescription:
Enabled: false
RSpec/RepeatedIncludeExample:
Enabled: false
RSpec/ReturnFromStub:
Enabled: false
RSpec/SharedExamples:
Enabled: false
RSpec/StubbedMock:
Enabled: false
RSpec/UnspecifiedException:
Enabled: false
RSpec/VariableDefinition:
Enabled: false
RSpec/VoidExpect:
Enabled: false
RSpec/Yield:
Enabled: false
Security/Open:
Enabled: false
Style/AccessModifierDeclarations:
Enabled: false
Style/AccessorGrouping:
Enabled: false
Style/AsciiComments:
Enabled: false
Style/BisectedAttrAccessor:
Enabled: false
Style/CaseLikeIf:
Enabled: false
Style/ClassEqualityComparison:
Enabled: false
Style/ColonMethodDefinition:
Enabled: false
Style/CombinableLoops:
Enabled: false
Style/CommentedKeyword:
Enabled: false
Style/Dir:
Enabled: false
Style/DoubleCopDisableDirective:
Enabled: false
Style/EmptyBlockParameter:
Enabled: false
Style/EmptyLambdaParameter:
Enabled: false
Style/Encoding:
Enabled: false
Style/EvalWithLocation:
Enabled: false
Style/ExpandPathArguments:
Enabled: false
Style/ExplicitBlockArgument:
Enabled: false
Style/ExponentialNotation:
Enabled: false
Style/FloatDivision:
Enabled: false
Style/FrozenStringLiteralComment:
Enabled: false
Style/GlobalStdStream:
Enabled: false
Style/HashAsLastArrayItem:
Enabled: false
Style/HashLikeCase:
Enabled: false
Style/HashTransformKeys:
Enabled: false
Style/HashTransformValues:
Enabled: false
Style/IfUnlessModifier:
Enabled: false
Style/KeywordParametersOrder:
Enabled: false
Style/MinMax:
Enabled: false
Style/MixinUsage:
Enabled: false
Style/MultilineWhenThen:
Enabled: false
Style/NegatedUnless:
Enabled: false
Style/NumericPredicate:
Enabled: false
Style/OptionalBooleanParameter:
Enabled: false
Style/OrAssignment:
Enabled: false
Style/RandomWithOffset:
Enabled: false
Style/RedundantAssignment:
Enabled: false
Style/RedundantCondition:
Enabled: false
Style/RedundantConditional:
Enabled: false
Style/RedundantFetchBlock:
Enabled: false
Style/RedundantFileExtensionInRequire:
Enabled: false
Style/RedundantRegexpCharacterClass:
Enabled: false
Style/RedundantRegexpEscape:
Enabled: false
Style/RedundantSelfAssignment:
Enabled: false
Style/RedundantSort:
Enabled: false
Style/RescueStandardError:
Enabled: false
Style/SingleArgumentDig:
Enabled: false
Style/SlicingWithRange:
Enabled: false
Style/SoleNestedConditional:
Enabled: false
Style/StderrPuts:
Enabled: false
Style/StringConcatenation:
Enabled: false
Style/Strip:
Enabled: false
Style/SymbolProc:
Enabled: false
Style/TrailingBodyOnClass:
Enabled: false
Style/TrailingBodyOnMethodDefinition:
Enabled: false
Style/TrailingBodyOnModule:
Enabled: false
Style/TrailingCommaInHashLiteral:
Enabled: false
Style/TrailingMethodEndStatement:
Enabled: false
Style/UnpackFirst:
Enabled: false
Lint/DuplicateBranch:
Enabled: false
Lint/DuplicateRegexpCharacterClassElement:
Enabled: false
Lint/EmptyBlock:
Enabled: false
Lint/EmptyClass:
Enabled: false
Lint/NoReturnInBeginEndBlocks:
Enabled: false
Lint/ToEnumArguments:
Enabled: false
Lint/UnexpectedBlockArity:
Enabled: false
Lint/UnmodifiedReduceAccumulator:
Enabled: false
Performance/CollectionLiteralInLoop:
Enabled: false
Style/ArgumentsForwarding:
Enabled: false
Style/CollectionCompact:
Enabled: false
Style/DocumentDynamicEvalDefinition:
Enabled: false
Style/NegatedIfElseCondition:
Enabled: false
Style/NilLambda:
Enabled: false
Style/RedundantArgument:
Enabled: false
Style/SwapValues:
Enabled: false

View File

@@ -1,7 +1,30 @@
--- ---
".gitlab-ci.yml":
delete: true
appveyor.yml:
delete: true
Gemfile:
optional:
":development":
- gem: github_changelog_generator
spec/spec_helper.rb:
mock_with: ":rspec"
coverage_report: true
.gitpod.Dockerfile:
unmanaged: false
.gitpod.yml:
unmanaged: false
.github/workflows/nightly.yml:
unmanaged: false
.github/workflows/pr_test.yml:
unmanaged: false
.github/workflows/auto_release.yml:
unmanaged: false
.github/workflows/spec.yml:
checks: 'syntax lint metadata_lint check:symlinks check:git_ignore check:dot_underscore check:test_file rubocop'
unmanaged: false
.github/workflows/release.yml:
unmanaged: false
.travis.yml: .travis.yml:
extras: delete: true
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"

View File

@@ -1,24 +0,0 @@
---
sudo: false
language: ruby
bundler_args: --without system_tests
script: "bundle exec rake validate && bundle exec rake lint && bundle exec rake spec SPEC_OPTS='--format documentation'"
matrix:
fast_finish: true
include:
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 1.9.3
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0"
- rvm: 2.1.5
env: PUPPET_GEM_VERSION="~> 3.0" FUTURE_PARSER="yes"
- rvm: 2.1.6
env: PUPPET_GEM_VERSION="~> 4.0" STRICT_VARIABLES="yes"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.6.0"
- rvm: 1.8.7
env: PUPPET_GEM_VERSION="~> 2.7.0" FACTER_GEM_VERSION="~> 1.7.0"
notifications:
email: false

6
.vscode/extensions.json vendored Normal file
View File

@@ -0,0 +1,6 @@
{
"recommendations": [
"puppet.puppet-vscode",
"rebornix.Ruby"
]
}

1
.yardopts Normal file
View File

@@ -0,0 +1 @@
--markup markdown

View File

@@ -1,5 +1,382 @@
# Change log
All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org).
## [v8.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v8.0.0) (2022-04-05)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.3.0...v8.0.0)
### Changed
- \(GH-C&T-7\) Remove code specific to unsupported OSs [\#507](https://github.com/puppetlabs/puppetlabs-java/pull/507) ([david22swan](https://github.com/david22swan))
### Added
- \(MODULES-11234\) Support Adoptium Temurin [\#502](https://github.com/puppetlabs/puppetlabs-java/pull/502) ([dploeger](https://github.com/dploeger))
### Fixed
- pdksync - \(IAC-1787\) Remove Support for CentOS 6 [\#503](https://github.com/puppetlabs/puppetlabs-java/pull/503) ([david22swan](https://github.com/david22swan))
- pdksync - \(GH-iac-334\) Remove Support for Ubuntu 14.04/16.04 [\#505](https://github.com/puppetlabs/puppetlabs-java/pull/505) ([david22swan](https://github.com/david22swan))
## [v7.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.3.0) (2021-10-11)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.2.0...v7.3.0)
### Added
- pdksync - \(IAC-1753\) - Add Support for AlmaLinux 8 [\#500](https://github.com/puppetlabs/puppetlabs-java/pull/500) ([david22swan](https://github.com/david22swan))
- pdksync - \(IAC-1751\) - Add Support for Rocky 8 [\#499](https://github.com/puppetlabs/puppetlabs-java/pull/499) ([david22swan](https://github.com/david22swan))
### Fixed
- pdksync - \(IAC-1598\) - Remove Support for Debian 8 [\#498](https://github.com/puppetlabs/puppetlabs-java/pull/498) ([david22swan](https://github.com/david22swan))
## [v7.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.2.0) (2021-09-20)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.1.1...v7.2.0)
### Added
- Enabling Rocky Linux for Install [\#488](https://github.com/puppetlabs/puppetlabs-java/pull/488) ([pmjensen](https://github.com/pmjensen))
### Fixed
- Allow archive 6.x [\#493](https://github.com/puppetlabs/puppetlabs-java/pull/493) ([smortex](https://github.com/smortex))
## [v7.1.1](https://github.com/puppetlabs/puppetlabs-java/tree/v7.1.1) (2021-08-26)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.1.0...v7.1.1)
### Fixed
- \(IAC-1741\) Allow stdlib v8.0.0 [\#491](https://github.com/puppetlabs/puppetlabs-java/pull/491) ([david22swan](https://github.com/david22swan))
## [v7.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.1.0) (2021-08-12)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.2...v7.1.0)
### Added
- pdksync - \(IAC-1709\) - Add Support for Debian 11 [\#489](https://github.com/puppetlabs/puppetlabs-java/pull/489) ([david22swan](https://github.com/david22swan))
## [v7.0.2](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.2) (2021-04-26)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.1...v7.0.2)
### Fixed
- add url parameter for adoptopenjdk [\#473](https://github.com/puppetlabs/puppetlabs-java/pull/473) ([cbobinec](https://github.com/cbobinec))
## [v7.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.1) (2021-04-19)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v7.0.0...v7.0.1)
### Fixed
- allow v5.x of puppet/archive [\#476](https://github.com/puppetlabs/puppetlabs-java/pull/476) ([bastelfreak](https://github.com/bastelfreak))
## [v7.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v7.0.0) (2021-03-01)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.5.0...v7.0.0)
### Changed
- pdksync - Remove Puppet 5 from testing and bump minimal version to 6.0.0 [\#463](https://github.com/puppetlabs/puppetlabs-java/pull/463) ([carabasdaniel](https://github.com/carabasdaniel))
### Fixed
- \(MODULES-10935\) - Switch legacy operatingsystem fact to modern kernel one [\#461](https://github.com/puppetlabs/puppetlabs-java/pull/461) ([rjd1](https://github.com/rjd1))
## [v6.5.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.5.0) (2020-12-16)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.4.0...v6.5.0)
### Added
- pdksync - \(feat\) Add support for Puppet 7 [\#454](https://github.com/puppetlabs/puppetlabs-java/pull/454) ([daianamezdrea](https://github.com/daianamezdrea))
## [v6.4.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.4.0) (2020-11-09)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.3.0...v6.4.0)
### Added
- Add support for SAP Java \(sapjvm / sapmachine\) [\#433](https://github.com/puppetlabs/puppetlabs-java/pull/433) ([timdeluxe](https://github.com/timdeluxe))
### Fixed
- \[IAC-1208\] - Add the good links for solving the 404 error and exclude sles [\#443](https://github.com/puppetlabs/puppetlabs-java/pull/443) ([daianamezdrea](https://github.com/daianamezdrea))
- \(IAC-993\) - Removal of inappropriate terminology [\#439](https://github.com/puppetlabs/puppetlabs-java/pull/439) ([david22swan](https://github.com/david22swan))
## [v6.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.3.0) (2020-05-27)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.2.0...v6.3.0)
### Added
- \(MODULES-10681\) Add option to manage symlink to java::adopt [\#429](https://github.com/puppetlabs/puppetlabs-java/pull/429) ([fraenki](https://github.com/fraenki))
- \(IAC-746\) - Add ubuntu 20.04 support [\#428](https://github.com/puppetlabs/puppetlabs-java/pull/428) ([david22swan](https://github.com/david22swan))
## [v6.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.2.0) (2020-02-18)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.1.0...v6.2.0)
### Added
- Support AdoptOpenJDK [\#370](https://github.com/puppetlabs/puppetlabs-java/pull/370) ([timdeluxe](https://github.com/timdeluxe))
### Fixed
- Replace legacy facts by modern facts [\#406](https://github.com/puppetlabs/puppetlabs-java/pull/406) ([hdeheer](https://github.com/hdeheer))
## [v6.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.1.0) (2020-02-03)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v6.0.0...v6.1.0)
## [v6.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v6.0.0) (2019-11-11)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v5.0.1...v6.0.0)
### Added
- \(FM-8676\) Add CentOS 8 to supported OS list [\#399](https://github.com/puppetlabs/puppetlabs-java/pull/399) ([david22swan](https://github.com/david22swan))
- FM-8403 - add support Debain10 [\#387](https://github.com/puppetlabs/puppetlabs-java/pull/387) ([lionce](https://github.com/lionce))
### Fixed
- we need to check if java\_default\_home has a value before we attempt t… [\#391](https://github.com/puppetlabs/puppetlabs-java/pull/391) ([robmbrooks](https://github.com/robmbrooks))
- Add support for java 11, the default in debian buster 10 [\#386](https://github.com/puppetlabs/puppetlabs-java/pull/386) ([jhooyberghs](https://github.com/jhooyberghs))
## [v5.0.1](https://github.com/puppetlabs/puppetlabs-java/tree/v5.0.1) (2019-08-05)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v5.0.0...v5.0.1)
## [v5.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v5.0.0) (2019-07-29)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v4.1.0...v5.0.0)
### Changed
- \[FM-8320\] Remove Oracle download [\#372](https://github.com/puppetlabs/puppetlabs-java/pull/372) ([carabasdaniel](https://github.com/carabasdaniel))
### Added
- \(FM-8223\) converted to use litmus [\#376](https://github.com/puppetlabs/puppetlabs-java/pull/376) ([tphoney](https://github.com/tphoney))
- Add buster support, default to 11 [\#369](https://github.com/puppetlabs/puppetlabs-java/pull/369) ([mhjacks](https://github.com/mhjacks))
- Add support for debian buster [\#364](https://github.com/puppetlabs/puppetlabs-java/pull/364) ([TomRitserveldt](https://github.com/TomRitserveldt))
### Fixed
- \(FM-8343\) use release numbers not lsbdistcodename [\#375](https://github.com/puppetlabs/puppetlabs-java/pull/375) ([tphoney](https://github.com/tphoney))
- Revert "Add support for debian buster" [\#374](https://github.com/puppetlabs/puppetlabs-java/pull/374) ([tphoney](https://github.com/tphoney))
## [v4.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/v4.1.0) (2019-05-29)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/v4.0.0...v4.1.0)
### Added
- \(FM-8028\) Add RedHat 8 support [\#363](https://github.com/puppetlabs/puppetlabs-java/pull/363) ([eimlav](https://github.com/eimlav))
## [v4.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/v4.0.0) (2019-05-20)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.3.0...v4.0.0)
### Changed
- pdksync - \(MODULES-8444\) - Raise lower Puppet bound [\#356](https://github.com/puppetlabs/puppetlabs-java/pull/356) ([david22swan](https://github.com/david22swan))
### Added
- \(FM-7921\) - Implement Puppet Strings [\#353](https://github.com/puppetlabs/puppetlabs-java/pull/353) ([david22swan](https://github.com/david22swan))
- Update default version & java 8 version from 8u192 to 8u201 [\#347](https://github.com/puppetlabs/puppetlabs-java/pull/347) ([valentinsavenko](https://github.com/valentinsavenko))
- Add ability to override basedir and package type for oracle java [\#345](https://github.com/puppetlabs/puppetlabs-java/pull/345) ([fraenki](https://github.com/fraenki))
- MODULES-8613: Add option to set a custom JCE download URL [\#344](https://github.com/puppetlabs/puppetlabs-java/pull/344) ([HielkeJ](https://github.com/HielkeJ))
### Fixed
- MODULES-8698: Fix $install\_path on CentOS with tar.gz package type [\#349](https://github.com/puppetlabs/puppetlabs-java/pull/349) ([fraenki](https://github.com/fraenki))
## [3.3.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.3.0) (2019-01-17)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.2.0...3.3.0)
### Added
- \(MODULES-8234\) - Add SLES 15 support [\#336](https://github.com/puppetlabs/puppetlabs-java/pull/336) ([eimlav](https://github.com/eimlav))
- \(MODULES-8234\) - Upgrade Oracle Java version to 8u192 [\#334](https://github.com/puppetlabs/puppetlabs-java/pull/334) ([eimlav](https://github.com/eimlav))
- Support for installing JCE. Fixes MODULES-1681 [\#326](https://github.com/puppetlabs/puppetlabs-java/pull/326) ([dploeger](https://github.com/dploeger))
- MODULES-8044: upgrade Oracle Java 8 to 181, make it the default release [\#314](https://github.com/puppetlabs/puppetlabs-java/pull/314) ([ojongerius](https://github.com/ojongerius))
### Fixed
- pdksync - \(FM-7655\) Fix rubygems-update for ruby \< 2.3 [\#338](https://github.com/puppetlabs/puppetlabs-java/pull/338) ([tphoney](https://github.com/tphoney))
- \(FM-7520\) - Removing Solaris from the support matrix [\#335](https://github.com/puppetlabs/puppetlabs-java/pull/335) ([pmcmaw](https://github.com/pmcmaw))
- Optimized code for making java::oracle atomic. Fixes MODULES-8085 [\#330](https://github.com/puppetlabs/puppetlabs-java/pull/330) ([dploeger](https://github.com/dploeger))
- Fix OpenJDK paths on Debian based OS with ARM [\#329](https://github.com/puppetlabs/puppetlabs-java/pull/329) ([mmoll](https://github.com/mmoll))
- \(MODULES-7050\) - Fix OracleJDK reinstalling on Puppet runs [\#323](https://github.com/puppetlabs/puppetlabs-java/pull/323) ([eimlav](https://github.com/eimlav))
- \(MODULES-8025\) Switch default for Ubuntu 18.04 to 11 [\#322](https://github.com/puppetlabs/puppetlabs-java/pull/322) ([baurmatt](https://github.com/baurmatt))
- MODULES-7819 fix set JAVA\_HOME environments on FreeBSD platform [\#315](https://github.com/puppetlabs/puppetlabs-java/pull/315) ([olevole](https://github.com/olevole))
## [3.2.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.2.0) (2018-09-27)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.1.0...3.2.0)
### Added
- pdksync - \(MODULES-6805\) metadata.json shows support for puppet 6 [\#317](https://github.com/puppetlabs/puppetlabs-java/pull/317) ([tphoney](https://github.com/tphoney))
## [3.1.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.1.0) (2018-09-06)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/3.0.0...3.1.0)
### Added
- pdksync - \(MODULES-7705\) - Bumping stdlib dependency from \< 5.0.0 to \< 6.0.0 [\#310](https://github.com/puppetlabs/puppetlabs-java/pull/310) ([pmcmaw](https://github.com/pmcmaw))
## [3.0.0](https://github.com/puppetlabs/puppetlabs-java/tree/3.0.0) (2018-08-13)
[Full Changelog](https://github.com/puppetlabs/puppetlabs-java/compare/2.4.0...3.0.0)
### Changed
- \[FM-6963\] Removal of unsupported OS from java [\#295](https://github.com/puppetlabs/puppetlabs-java/pull/295) ([david22swan](https://github.com/david22swan))
### Added
- \(MODULES-7561\) - Addition of support for Ubuntu 18.04 to java [\#299](https://github.com/puppetlabs/puppetlabs-java/pull/299) ([david22swan](https://github.com/david22swan))
### Fixed
- Remove ensure\_resource to avoid potential conflict [\#287](https://github.com/puppetlabs/puppetlabs-java/pull/287) ([sevencastles](https://github.com/sevencastles))
## 2.4.0
### Summary
This release uses the PDK convert functionality which in return makes the module PDK compliant. Also includes a clean up from Rubocop.
#### Changed
- 1.3.2 PDK convert has been applied [MODULES-6456](https://tickets.puppetlabs.com/browse/MODULES-6456)
- The modules has undergone a Rubocop cleanup.
#### Fixed
- $java_home for SLES 11.4 has been updated to the correct location.
## Supported Release [2.3.0]
### Summary
This release is in order to implement Rubocop changes into the module.
#### Added
- Several Modulesync changes have been made.
- Rubocop has been implemented in the module.
- CentOS 7 is now supported.
- Red Hat Enterprise Linux (RHEL) 7 is now supported.
- Ubuntu artful 1710 now supported.
- Bionic 1804 now supported.
## Supported Release [2.2.0]
### Summary
This release is a maintenance release that includes a roll up of minor changes.
#### Added
- Addition of Ubuntu for Oracle Java.
- Addition of Debian 9 in supported versions.
- Addition of OpenBSD case and use `realpath` rather than `readlink` in Java Default Home Facter fact.
#### Removed
- Removal of OpenBSD as a special case and deprecated `with_env` in Java Version Facter Facter fact.
## Supported Release 2.1.1
### Summary
This release is a maintenance release that includes a roll up of minor changes.
#### Added
- Basic Arch Linux, Cloud Linux and Ubuntu 17.04 compatibility.
- Metadata bump for Puppet 5.
- Search for matching line with java version.
- ([MODULES-4069](https://tickets.puppet.com/browse/MODULES-4069)) Fail when required params are not available in params.
- A test for java version when java not installed.
- Allow latest archive version as dependency.
#### Changed
- CONTRIBUTING.md document includes updates.
- Removal of Ubuntu 10.04 ad 12.04, Debian 6 in supported versions.
## Supported Release 2.1.0
### Summary
This release adds fixes to restore the ability to install Oracle Java. It also fixes the paths for the latest RHEL 7 1.7.0 and 1.8.0 OpenJDKs.
### Added
- java::oracle parameter `url`
- java::oracle parameter `url_hash`
### Fixed
- Let `java_default_home` fact work when /usr/bin/java does not exist
- Add puppet 4 parameter types
- Use `/usr/lib/jvm/java-1.x.0` symlinks for `java_home` defaults.
## Supported Release 2.0.0
### Summary
This is a major release including some bug fixes, new parameters, and general module updates.
**This release drops Puppet 3 support**
#### Added
- Debian Stretch, Yakkety Yak, Amazon Linux, Oracle Linux, Scientific Linux CERN compatibility
- `version_major` and `version_minor` parameters for specifying Java SE version to install
- `$JAVA_HOME` now set by the module on compatible systems. The `java_home` parameter is also provided for manual setting. [MODULES-2971](https://tickets.puppetlabs.com/browse/MODULES-2971)
- `proxy_server` and `proxy_type` for choosing a proxy server to get Java from
#### Changed
- Moved lower Puppet version requirement to 4.7.0
#### Fixed
- Module no longer downloads the Java archive on Puppet runs if Java is already installed.
- java_default_home fact is not always correct on oracle packages [MODULES-4050](https://tickets.puppetlabs.com/browse/MODULES-4050)
- Order of operations for archives [MODULES-4751](https://tickets.puppetlabs.com/browse/https://tickets.puppetlabs.com/browse/MODULES-4751)
- Increase Xmx setting for `java_version` fact [MODULES-4736](https://tickets.puppetlabs.com/browse/MODULES-4736)
## 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
A release which has several support additions for different OSes. Also a couple of additional features and a few bug fixes.
#### Features
- Added Ubuntu 15.10 compatibility.
- Addition of two facts: java_libjvm_path and java_default_home.
- Added support for oracle-j2re1.8 and oracle-j2sdk1.8.
- Adds FreeBSD Support.
- Exposed the Puppet package resources install_options parameter via a new class parameter named package_options.
- Debian 8 support.
- Add support for official Oracle Java SE jdk and jre packages for CentOS.
- Use java 8 as the default on RHEL > 7.0.
#### Bugfixes
- Updated fixtures.yml to use git instead of http for stdlib.
- Updates to current msync configs.
- Small README updates and syntax error fixes.
## Supported Release 1.4.3 ## Supported Release 1.4.3
###Summary ### Summary
Small release for support of newer PE versions. This increments the version of PE in the metadata.json file. Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
@@ -17,18 +394,18 @@ This release updates the metadata for the upcoming release of PE and update para
#### Bugfixes: #### Bugfixes:
- Add missing OEL to params - Add missing OEL to params
##2015-07-07 - Supported Release 1.4.0 ## 2015-07-07 - Supported Release 1.4.0
###Summary ### Summary
This release adds several new features, bugfixes, documentation updates, and test improvements. This release adds several new features, bugfixes, documentation updates, and test improvements.
####Features: #### Features:
- Puppet 4 support and testing - Puppet 4 support and testing
- Adds support for several Operating Systems - Adds support for several Operating Systems
- Ubuntu 15.04 - Ubuntu 15.04
- OpenBSD 5.6, 5.7 - OpenBSD 5.6, 5.7
- Fedora 20, 21, 22 - Fedora 20, 21, 22
####Bugfixes: #### Bugfixes:
- Fixes java_version fact to work on large systems. (MODULES-1749) - Fixes java_version fact to work on large systems. (MODULES-1749)
- Improves maintainability of java_version fact. - Improves maintainability of java_version fact.
- Fixes java package names on Fedora 21+. - Fixes java package names on Fedora 21+.
@@ -36,11 +413,11 @@ This release adds several new features, bugfixes, documentation updates, and tes
- Fixes create-java-alternatives commands on RedHat distros. - Fixes create-java-alternatives commands on RedHat distros.
- Fixes bug with Debian systems missing java-common package. - Fixes bug with Debian systems missing java-common package.
##2015-01-20 - Supported Release 1.3.0 ## 2015-01-20 - Supported Release 1.3.0
###Summary ### Summary
This release adds 3 new facts for determining Java version, adds RHEL alternatives support, adds utopic support, and fixes the flag for `update-java-alternatives` when installed from a headless pacakge. This release adds 3 new facts for determining Java version, adds RHEL alternatives support, adds utopic support, and fixes the flag for `update-java-alternatives` when installed from a headless pacakge.
####Features #### Features
- Added RHEL support for alternatives - Added RHEL support for alternatives
- New facts - New facts
- java_major_version - java_major_version
@@ -48,65 +425,65 @@ This release adds 3 new facts for determining Java version, adds RHEL alternativ
- java_version - java_version
- Add support for utopic - Add support for utopic
####Bugfixes #### Bugfixes
- Use `--jre-headless` in the `update-java-alternatives` command when installed from a `headless` package - Use `--jre-headless` in the `update-java-alternatives` command when installed from a `headless` package
##2014-11-11 - Supported Version 1.2.0 ## 2014-11-11 - Supported Version 1.2.0
###Summary: ### Summary:
This release adds SLES 12 support and is tested for Future Parser Support This release adds SLES 12 support and is tested for Future Parser Support
####Bugfixes: #### Bugfixes:
- Several readme updates - Several readme updates
- Testcase flexability increased - Testcase flexability increased
####Features: #### Features:
- Add SLES 12 support - Add SLES 12 support
- Future Parser tested - Future Parser tested
- Validated against PE 3.7 - Validated against PE 3.7
##2014-08-25 - Supported Version 1.1.2 ## 2014-08-25 - Supported Version 1.1.2
###Summary: ### Summary:
This release begins the support coverage of the puppetlabs-java module. This release begins the support coverage of the puppetlabs-java module.
###Bugfixes: ### Bugfixes:
- Update java alternative values from deprecated names - Update java alternative values from deprecated names
- Readme updated - Readme updated
- Testing updated - Testing updated
##2014-05-02 - Version 1.1.1 ## 2014-05-02 - Version 1.1.1
###Summary: ### Summary:
Add support for new versions of Debian and Ubuntu! Add support for new versions of Debian and Ubuntu!
####Features: #### Features:
- Add support for Ubuntu Trusty (14.04) - Add support for Ubuntu Trusty (14.04)
- Add support for Debian Jessie (8.x) - Add support for Debian Jessie (8.x)
##2014-01-06 - Version 1.1.0 ## 2014-01-06 - Version 1.1.0
####Summary: ### Summary:
Primarily a release for Ubuntu users! Primarily a release for Ubuntu users!
####Features: #### Features:
- Add support for Ubuntu Saucy (13.10) - Add support for Ubuntu Saucy (13.10)
- Add `java_home` parameter for centralized setting of JAVA_HOME. - Add `java_home` parameter for centralized setting of JAVA_HOME.
- Add Scientific Linux - Add Scientific Linux
###Bugfixes: #### Bugfixes:
- Plus signs are valid in debian/ubuntu package names. - Plus signs are valid in debian/ubuntu package names.
##2013-08-01 - Version 1.0.1 ## 2013-08-01 - Version 1.0.1
Matthaus Owens <matthaus@puppetlabs.com> Matthaus Owens <matthaus@puppetlabs.com>
* Update java packages for Fedora systems * Update java packages for Fedora systems
##2013-07-29 - Version 1.0.0 ## 2013-07-29 - Version 1.0.0
####Detailed Changes #### Detailed Changes
Krzysztof Suszyński <krzysztof.suszynski@coi.gov.pl> Krzysztof Suszyński <krzysztof.suszynski@coi.gov.pl>
* Adding support for Oracle Enterprise Linux * Adding support for Oracle Enterprise Linux
@@ -131,39 +508,45 @@ Nathan R Valentine <nrvale0@gmail.com>
Sharif Nassar <sharif@mediatemple.net> Sharif Nassar <sharif@mediatemple.net>
* Add support for Debian alternatives, and more than one JDK/JRE per platform. * Add support for Debian alternatives, and more than one JDK/JRE per platform.
##2013-04-04 - Version 0.3.0 ## 2013-04-04 - Version 0.3.0
Reid Vandewiele <reid@puppetlabs.com> - Reid Vandewiele <reid@puppetlabs.com> -
* Refactor, introduce params pattern * Refactor, introduce params pattern
##2012-11-15 - Version 0.2.0 ## 2012-11-15 - Version 0.2.0
Scott Schneider <sschneider@puppetlabs.com> Scott Schneider <sschneider@puppetlabs.com>
* Add Solaris support * Add Solaris support
##2011-06-16 - Version 0.1.5 ## 2011-06-16 - Version 0.1.5
Jeff McCune <jeff@puppetlabs.com> Jeff McCune <jeff@puppetlabs.com>
* Add Debian based distro (Lucid) support * Add Debian based distro (Lucid) support
##2011-06-02 - Version 0.1.4 ## 2011-06-02 - Version 0.1.4
Jeff McCune <jeff@puppetlabs.com> Jeff McCune <jeff@puppetlabs.com>
* Fix class composition ordering problems * Fix class composition ordering problems
##2011-05-28 - Version 0.1.3 ## 2011-05-28 - Version 0.1.3
Jeff McCune <jeff@puppetlabs.com> Jeff McCune <jeff@puppetlabs.com>
* Remove stages * Remove stages
##2011-05-26 - Version 0.1.2 ## 2011-05-26 - Version 0.1.2
Jeff McCune <jeff@puppetlabs.com> Jeff McCune <jeff@puppetlabs.com>
* Changes JRE/JDK selection class parameter to $distribution * Changes JRE/JDK selection class parameter to $distribution
##2011-05-25 - Version 0.1.1 ## 2011-05-25 - Version 0.1.1
Jeff McCune <jeff@puppetlabs.com> Jeff McCune <jeff@puppetlabs.com>
* Re-did versioning to follow semantic versioning * Re-did versioning to follow semantic versioning
* Add validation of class parameters * Add validation of class parameters
##2011-05-24 - Version 0.1.0 ## 2011-05-24 - Version 0.1.0
Jeff McCune <jeff@puppetlabs.com> Jeff McCune <jeff@puppetlabs.com>
* Default to JDK version 6u25 * Default to JDK version 6u25
##2011-05-24 - Version 0.0.1 ## 2011-05-24 - Version 0.0.1
Jeff McCune <jeff@puppetlabs.com> Jeff McCune <jeff@puppetlabs.com>
* Initial release * Initial release
[2.3.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.2.0...2.3.0
[2.2.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.1.1...2.2.0
\* *This Changelog was automatically generated by [github_changelog_generator](https://github.com/github-changelog-generator/github-changelog-generator)*

2
CODEOWNERS Normal file
View File

@@ -0,0 +1,2 @@
# Setting ownership to the modules team
* @puppetlabs/modules

View File

@@ -1,220 +1,3 @@
Checklist (and a short version for the impatient) # Contributing to Puppet modules
=================================================
* Commits:
- Make commits of logical units.
- Check for unnecessary whitespace with "git diff --check" before
committing.
- Commit using Unix line endings (check the settings around "crlf" in
git-config(1)).
- Do not check in commented out code or unneeded files.
- The first line of the commit message should be a short
description (50 characters is the soft limit, excluding ticket
number(s)), and should skip the full stop.
- Associate the issue in the message. The first line should include
the issue number in the form "(#XXXX) Rest of message".
- The body should provide a meaningful commit message, which:
- uses the imperative, present tense: "change", not "changed" or
"changes".
- includes motivation for the change, and contrasts its
implementation with the previous behavior.
- Make sure that you have tests for the bug you are fixing, or
feature you are adding.
- Make sure the test suites passes after your commit:
`bundle exec rspec spec/acceptance` More information on [testing](#Testing) below
- When introducing a new feature, make sure it is properly
documented in the README.md
* Submission:
* Pre-requisites:
- Make sure you have a [GitHub account](https://github.com/join)
- [Create a ticket](https://tickets.puppetlabs.com/secure/CreateIssue!default.jspa), or [watch the ticket](https://tickets.puppetlabs.com/browse/) you are patching for.
* Preferred method:
- Fork the repository on GitHub.
- Push your changes to a topic branch in your fork of the
repository. (the format ticket/1234-short_description_of_change is
usually preferred for this project).
- Submit a pull request to the repository in the puppetlabs
organization.
The long version
================
1. Make separate commits for logically separate changes.
Please break your commits down into logically consistent units
which include new or changed tests relevant to the rest of the
change. The goal of doing this is to make the diff easier to
read for whoever is reviewing your code. In general, the easier
your diff is to read, the more likely someone will be happy to
review it and get it into the code base.
If you are going to refactor a piece of code, please do so as a
separate commit from your feature or bug fix changes.
We also really appreciate changes that include tests to make
sure the bug is not re-introduced, and that the feature is not
accidentally broken.
Describe the technical detail of the change(s). If your
description starts to get too long, that is a good sign that you
probably need to split up your commit into more finely grained
pieces.
Commits which plainly describe the things which help
reviewers check the patch and future developers understand the
code are much more likely to be merged in with a minimum of
bike-shedding or requested changes. Ideally, the commit message
would include information, and be in a form suitable for
inclusion in the release notes for the version of Puppet that
includes them.
Please also check that you are not introducing any trailing
whitespace or other "whitespace errors". You can do this by
running "git diff --check" on your changes before you commit.
2. Sending your patches
To submit your changes via a GitHub pull request, we _highly_
recommend that you have them on a topic branch, instead of
directly on "master".
It makes things much easier to keep track of, especially if
you decide to work on another thing before your first change
is merged in.
GitHub has some pretty good
[general documentation](http://help.github.com/) on using
their site. They also have documentation on
[creating pull requests](http://help.github.com/send-pull-requests/).
In general, after pushing your topic branch up to your
repository on GitHub, you can switch to the branch in the
GitHub UI and click "Pull Request" towards the top of the page
in order to open a pull request.
3. Update the related GitHub issue.
If there is a GitHub issue associated with the change you
submitted, then you should update the ticket to include the
location of your branch, along with any other commentary you
may wish to make.
Testing
=======
Getting Started
---------------
Our puppet modules provide [`Gemfile`](./Gemfile)s which can tell a ruby
package manager such as [bundler](http://bundler.io/) what Ruby packages,
or Gems, are required to build, develop, and test this software.
Please make sure you have [bundler installed](http://bundler.io/#getting-started)
on your system, then use it to install all dependencies needed for this project,
by running
```shell
% bundle install
Fetching gem metadata from https://rubygems.org/........
Fetching gem metadata from https://rubygems.org/..
Using rake (10.1.0)
Using builder (3.2.2)
-- 8><-- many more --><8 --
Using rspec-system-puppet (2.2.0)
Using serverspec (0.6.3)
Using rspec-system-serverspec (1.0.0)
Using bundler (1.3.5)
Your bundle is complete!
Use `bundle show [gemname]` to see where a bundled gem is installed.
```
NOTE some systems may require you to run this command with sudo.
If you already have those gems installed, make sure they are up-to-date:
```shell
% bundle update
```
With all dependencies in place and up-to-date we can now run the tests:
```shell
% rake spec
```
This will execute all the [rspec tests](http://rspec-puppet.com/) tests
under [spec/defines](./spec/defines), [spec/classes](./spec/classes),
and so on. rspec tests may have the same kind of dependencies as the
module they are testing. While the module defines in its [Modulefile](./Modulefile),
rspec tests define them in [.fixtures.yml](./fixtures.yml).
Some puppet modules also come with [beaker](https://github.com/puppetlabs/beaker)
tests. These tests spin up a virtual machine under
[VirtualBox](https://www.virtualbox.org/)) with, controlling it with
[Vagrant](http://www.vagrantup.com/) to actually simulate scripted test
scenarios. In order to run these, you will need both of those tools
installed on your system.
You can run them by issuing the following command
```shell
% rake spec_clean
% rspec spec/acceptance
```
This will now download a pre-fabricated image configured in the [default node-set](./spec/acceptance/nodesets/default.yml),
install puppet, copy this module and install its dependencies per [spec/spec_helper_acceptance.rb](./spec/spec_helper_acceptance.rb)
and then run all the tests under [spec/acceptance](./spec/acceptance).
Writing Tests
-------------
XXX getting started writing tests.
If you have commit access to the repository
===========================================
Even if you have commit access to the repository, you will still need to
go through the process above, and have someone else review and merge
in your changes. The rule is that all changes must be reviewed by a
developer on the project (that did not write the code) to ensure that
all changes go through a code review process.
Having someone other than the author of the topic branch recorded as
performing the merge is the record that they performed the code
review.
Additional Resources
====================
* [Getting additional help](http://puppetlabs.com/community/get-help)
* [Writing tests](http://projects.puppetlabs.com/projects/puppet/wiki/Development_Writing_Tests)
* [Patchwork](https://patchwork.puppetlabs.com)
* [General GitHub documentation](http://help.github.com/)
* [GitHub pull request documentation](http://help.github.com/send-pull-requests/)
Check out our [Contributing to Supported Modules Blog Post](https://puppetlabs.github.io/iac/docs/contributing_to_a_module.html) to find all the information that you will need.

94
Gemfile
View File

@@ -1,48 +1,64 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org" source ENV['GEM_SOURCE'] || 'https://rubygems.org'
def location_for(place, fake_version = nil) def location_for(place_or_version, fake_version = nil)
if place =~ /^(git:[^#]*)#(.*)/ git_url_regex = %r{\A(?<url>(https?|git)[:@][^#]*)(#(?<branch>.*))?}
[fake_version, { :git => $1, :branch => $2, :require => false }].compact file_url_regex = %r{\Afile:\/\/(?<path>.*)}
elsif place =~ /^file:\/\/(.*)/
['>= 0', { :path => File.expand_path($1), :require => false }] if place_or_version && (git_url = place_or_version.match(git_url_regex))
[fake_version, { git: git_url[:url], branch: git_url[:branch], require: false }].compact
elsif place_or_version && (file_url = place_or_version.match(file_url_regex))
['>= 0', { path: File.expand_path(file_url[:path]), require: false }]
else else
[place, { :require => false }] [place_or_version, { require: false }]
end end
end end
group :development, :unit_tests do ruby_version_segments = Gem::Version.new(RUBY_VERSION.dup).segments
gem 'rspec-core', '3.1.7', :require => false minor_version = ruby_version_segments[0..1].join('.')
gem 'puppetlabs_spec_helper', :require => false
gem 'simplecov', :require => false
gem 'puppet_facts', :require => false
gem 'json', :require => false
end
group :development do
gem "json", '= 2.0.4', require: false if Gem::Requirement.create('~> 2.4.2').satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.1.0', require: false if Gem::Requirement.create(['>= 2.5.0', '< 2.7.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "json", '= 2.3.0', require: false if Gem::Requirement.create(['>= 2.7.0', '< 2.8.0']).satisfied_by?(Gem::Version.new(RUBY_VERSION.dup))
gem "puppet-module-posix-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-posix-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem "puppet-module-win-default-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "puppet-module-win-dev-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
gem "voxpupuli-puppet-lint-plugins", '>= 3.0', require: false, platforms: [:ruby]
gem "github_changelog_generator", require: false
end
group :system_tests do group :system_tests do
if beaker_version = ENV['BEAKER_VERSION'] gem "puppet-module-posix-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:ruby]
gem 'beaker', *location_for(beaker_version) gem "puppet-module-win-system-r#{minor_version}", '~> 1.0', require: false, platforms: [:mswin, :mingw, :x64_mingw]
end
puppet_version = ENV['PUPPET_GEM_VERSION']
facter_version = ENV['FACTER_GEM_VERSION']
hiera_version = ENV['HIERA_GEM_VERSION']
gems = {}
gems['puppet'] = location_for(puppet_version)
# If facter or hiera versions have been specified via the environment
# variables
gems['facter'] = location_for(facter_version) if facter_version
gems['hiera'] = location_for(hiera_version) if hiera_version
gems.each do |gem_name, gem_params|
gem gem_name, *gem_params
end
# Evaluate Gemfile.local and ~/.gemfile if they exist
extra_gemfiles = [
"#{__FILE__}.local",
File.join(Dir.home, '.gemfile'),
]
extra_gemfiles.each do |gemfile|
if File.file?(gemfile) && File.readable?(gemfile)
eval(File.read(gemfile), binding)
end end
if beaker_rspec_version = ENV['BEAKER_RSPEC_VERSION']
gem 'beaker-rspec', *location_for(beaker_rspec_version)
else
gem 'beaker-rspec', :require => false
end
gem 'serverspec', :require => false
gem 'beaker-puppet_install_helper', :require => false
end end
# vim: syntax=ruby
if facterversion = ENV['FACTER_GEM_VERSION']
gem 'facter', facterversion, :require => false
else
gem 'facter', :require => false
end
if puppetversion = ENV['PUPPET_GEM_VERSION']
gem 'puppet', puppetversion, :require => false
else
gem 'puppet', :require => false
end
# vim:ft=ruby

296
HISTORY.md Normal file
View File

@@ -0,0 +1,296 @@
## 2.4.0
### Summary
This release uses the PDK convert functionality which in return makes the module PDK compliant. Also includes a clean up from Rubocop.
#### Changed
- 1.3.2 PDK convert has been applied [MODULES-6456](https://tickets.puppetlabs.com/browse/MODULES-6456)
- The modules has undergone a Rubocop cleanup.
#### Fixed
- $java_home for SLES 11.4 has been updated to the correct location.
## Supported Release [2.3.0]
### Summary
This release is in order to implement Rubocop changes into the module.
#### Added
- Several Modulesync changes have been made.
- Rubocop has been implemented in the module.
- CentOS 7 is now supported.
- Red Hat Enterprise Linux (RHEL) 7 is now supported.
- Ubuntu artful 1710 now supported.
- Bionic 1804 now supported.
## Supported Release [2.2.0]
### Summary
This release is a maintenance release that includes a roll up of minor changes.
#### Added
- Addition of Ubuntu for Oracle Java.
- Addition of Debian 9 in supported versions.
- Addition of OpenBSD case and use `realpath` rather than `readlink` in Java Default Home Facter fact.
#### Removed
- Removal of OpenBSD as a special case and deprecated `with_env` in Java Version Facter Facter fact.
## Supported Release 2.1.1
### Summary
This release is a maintenance release that includes a roll up of minor changes.
#### Added
- Basic Arch Linux, Cloud Linux and Ubuntu 17.04 compatibility.
- Metadata bump for Puppet 5.
- Search for matching line with java version.
- ([MODULES-4069](https://tickets.puppet.com/browse/MODULES-4069)) Fail when required params are not available in params.
- A test for java version when java not installed.
- Allow latest archive version as dependency.
#### Changed
- CONTRIBUTING.md document includes updates.
- Removal of Ubuntu 10.04 ad 12.04, Debian 6 in supported versions.
## Supported Release 2.1.0
### Summary
This release adds fixes to restore the ability to install Oracle Java. It also fixes the paths for the latest RHEL 7 1.7.0 and 1.8.0 OpenJDKs.
### Added
- java::oracle parameter `url`
- java::oracle parameter `url_hash`
### Fixed
- Let `java_default_home` fact work when /usr/bin/java does not exist
- Add puppet 4 parameter types
- Use `/usr/lib/jvm/java-1.x.0` symlinks for `java_home` defaults.
## Supported Release 2.0.0
### Summary
This is a major release including some bug fixes, new parameters, and general module updates.
**This release drops Puppet 3 support**
#### Added
- Debian Stretch, Yakkety Yak, Amazon Linux, Oracle Linux, Scientific Linux CERN compatibility
- `version_major` and `version_minor` parameters for specifying Java SE version to install
- `$JAVA_HOME` now set by the module on compatible systems. The `java_home` parameter is also provided for manual setting. [MODULES-2971](https://tickets.puppetlabs.com/browse/MODULES-2971)
- `proxy_server` and `proxy_type` for choosing a proxy server to get Java from
#### Changed
- Moved lower Puppet version requirement to 4.7.0
#### Fixed
- Module no longer downloads the Java archive on Puppet runs if Java is already installed.
- java_default_home fact is not always correct on oracle packages [MODULES-4050](https://tickets.puppetlabs.com/browse/MODULES-4050)
- Order of operations for archives [MODULES-4751](https://tickets.puppetlabs.com/browse/https://tickets.puppetlabs.com/browse/MODULES-4751)
- Increase Xmx setting for `java_version` fact [MODULES-4736](https://tickets.puppetlabs.com/browse/MODULES-4736)
## 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
A release which has several support additions for different OSes. Also a couple of additional features and a few bug fixes.
#### Features
- Added Ubuntu 15.10 compatibility.
- Addition of two facts: java_libjvm_path and java_default_home.
- Added support for oracle-j2re1.8 and oracle-j2sdk1.8.
- Adds FreeBSD Support.
- Exposed the Puppet package resources install_options parameter via a new class parameter named package_options.
- Debian 8 support.
- Add support for official Oracle Java SE jdk and jre packages for CentOS.
- Use java 8 as the default on RHEL > 7.0.
#### Bugfixes
- Updated fixtures.yml to use git instead of http for stdlib.
- Updates to current msync configs.
- Small README updates and syntax error fixes.
## Supported Release 1.4.3
### Summary
Small release for support of newer PE versions. This increments the version of PE in the metadata.json file.
## 2015-10-07 - Supported Release 1.4.2
### Summary
This release fixes the fact to not trigger java every time on OS X when it is not available.
#### Bugfixes
- Causes java\_version fact to not run `java` when java is not installed on OS X
## 2015-07-16 - Supported Release 1.4.1
### Summary
This release updates the metadata for the upcoming release of PE and update params for OEL to match metadata
#### Bugfixes:
- Add missing OEL to params
## 2015-07-07 - Supported Release 1.4.0
### Summary
This release adds several new features, bugfixes, documentation updates, and test improvements.
#### Features:
- Puppet 4 support and testing
- Adds support for several Operating Systems
- Ubuntu 15.04
- OpenBSD 5.6, 5.7
- Fedora 20, 21, 22
#### Bugfixes:
- Fixes java_version fact to work on large systems. (MODULES-1749)
- Improves maintainability of java_version fact.
- Fixes java package names on Fedora 21+.
- Fixes java install problems on Puppet 3.7.5 - 3.8.1 (PUP-4520)
- Fixes create-java-alternatives commands on RedHat distros.
- Fixes bug with Debian systems missing java-common package.
## 2015-01-20 - Supported Release 1.3.0
### Summary
This release adds 3 new facts for determining Java version, adds RHEL alternatives support, adds utopic support, and fixes the flag for `update-java-alternatives` when installed from a headless pacakge.
#### Features
- Added RHEL support for alternatives
- New facts
- java_major_version
- java_patch_level
- java_version
- Add support for utopic
#### Bugfixes
- Use `--jre-headless` in the `update-java-alternatives` command when installed from a `headless` package
## 2014-11-11 - Supported Version 1.2.0
### Summary:
This release adds SLES 12 support and is tested for Future Parser Support
#### Bugfixes:
- Several readme updates
- Testcase flexability increased
#### Features:
- Add SLES 12 support
- Future Parser tested
- Validated against PE 3.7
## 2014-08-25 - Supported Version 1.1.2
### Summary:
This release begins the support coverage of the puppetlabs-java module.
### Bugfixes:
- Update java alternative values from deprecated names
- Readme updated
- Testing updated
## 2014-05-02 - Version 1.1.1
### Summary:
Add support for new versions of Debian and Ubuntu!
#### Features:
- Add support for Ubuntu Trusty (14.04)
- Add support for Debian Jessie (8.x)
## 2014-01-06 - Version 1.1.0
### Summary:
Primarily a release for Ubuntu users!
#### Features:
- Add support for Ubuntu Saucy (13.10)
- Add `java_home` parameter for centralized setting of JAVA_HOME.
- Add Scientific Linux
#### Bugfixes:
- Plus signs are valid in debian/ubuntu package names.
## 2013-08-01 - Version 1.0.1
Matthaus Owens <matthaus@puppetlabs.com>
* Update java packages for Fedora systems
## 2013-07-29 - Version 1.0.0
#### Detailed Changes
Krzysztof Suszyński <krzysztof.suszynski@coi.gov.pl>
* Adding support for Oracle Enterprise Linux
Peter Drake <pdrake@allplayers.com>
* Add support for natty
Robert Munteanu <rmuntean@adobe.com>
* Add support for OpenSUSE
Martin Jackson <martin@uncommonsense-uk.com>
* Added support Amazon Linux using facter >= 1.7.x
Gareth Rushgrove <gareth@morethanseven.net>
Brett Porter <brett@apache.org>
* Fixes for older versions of CentOS
* Improvements to module build and tests
Nathan R Valentine <nrvale0@gmail.com>
* Add support for Ubuntu quantal and raring
Sharif Nassar <sharif@mediatemple.net>
* Add support for Debian alternatives, and more than one JDK/JRE per platform.
## 2013-04-04 - Version 0.3.0
Reid Vandewiele <reid@puppetlabs.com> -
* Refactor, introduce params pattern
## 2012-11-15 - Version 0.2.0
Scott Schneider <sschneider@puppetlabs.com>
* Add Solaris support
## 2011-06-16 - Version 0.1.5
Jeff McCune <jeff@puppetlabs.com>
* Add Debian based distro (Lucid) support
## 2011-06-02 - Version 0.1.4
Jeff McCune <jeff@puppetlabs.com>
* Fix class composition ordering problems
## 2011-05-28 - Version 0.1.3
Jeff McCune <jeff@puppetlabs.com>
* Remove stages
## 2011-05-26 - Version 0.1.2
Jeff McCune <jeff@puppetlabs.com>
* Changes JRE/JDK selection class parameter to $distribution
## 2011-05-25 - Version 0.1.1
Jeff McCune <jeff@puppetlabs.com>
* Re-did versioning to follow semantic versioning
* Add validation of class parameters
## 2011-05-24 - Version 0.1.0
Jeff McCune <jeff@puppetlabs.com>
* Default to JDK version 6u25
## 2011-05-24 - Version 0.0.1
Jeff McCune <jeff@puppetlabs.com>
* Initial release
[2.3.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.2.0...2.3.0
[2.2.0]:https://github.com/puppetlabs/puppetlabs-java/compare/2.1.1...2.2.0

207
LICENSE
View File

@@ -1,17 +1,202 @@
Puppet Java Module - Puppet module for managing Java
Copyright (C) 2011 Puppet Labs Inc Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
Puppet Labs can be contacted at: info@puppetlabs.com TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
Licensed under the Apache License, Version 2.0 (the "License"); 1. Definitions.
you may not use this file except in compliance with the License.
You may obtain a copy of the License at "License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."
"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.
3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.
4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:
(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and
(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and
(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and
(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.
You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.
5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.
6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.
8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.
9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.
END OF TERMS AND CONDITIONS
APPENDIX: How to apply the Apache License to your work.
To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0 http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS, distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and See the License for the specific language governing permissions and
limitations under the License. limitations under the License.

15
NOTICE Normal file
View File

@@ -0,0 +1,15 @@
Puppet Module - puppetlabs-java
Copyright 2018 Puppet, Inc.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

View File

@@ -1,123 +0,0 @@
#java
####Table of Contents
1. [Overview](#overview)
2. [Module Description - What the module does and why it is useful](#module-description)
3. [Setup - The basics of getting started with the java module](#setup)
* [Beginning with the java module](#beginning-with-the-java-module)
4. [Usage - Configuration options and additional functionality](#usage)
5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
6. [Limitations - OS compatibility, etc.](#limitations)
7. [Development - Guide for contributing to the module](#development)
##Overview
Installs the correct Java package on various platforms.
##Module Description
The java module can automatically install Java jdk or jre on a wide variety of systems. Java is a base component for many software platforms, but Java system packages don't always follow packaging conventions. The java module simplifies the Java installation process.
##Setup
###Beginning with the java module
To install the correct Java package on your system, include the `java` class: `include java`.
##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:
~~~
class { 'java':
distribution => 'jre',
}
~~~
##Reference
###Classes
####Public classes
* `java`: Installs and manages the Java package.
####Private classes
* `java::config`: Configures the Java alternatives.
* `java::params`: Builds a hash of jdk/jre packages for all compatible operating systems.
####Parameters
The following parameters are available in `java`:
##### `distribution`
Specifies the Java distribution to install.
Valid options: 'jdk', 'jre', or, where the platform supports alternative packages, 'sun-jdk', 'sun-jre', 'oracle-jdk', 'oracle-jre'. Default: 'jdk'.
#####`java_alternative`
Specifies the name of the Java alternative to use. If you set this parameter, *you must also set the `java_alternative_path`.*
Valid options: Run command `update-java-alternatives -l` for a list of available choices. Default: OS and distribution dependent defaults on *deb systems, undef on others.
#####`java_alternative_path`
*Required when `java_alternative` is specified.* Defines the path to the `java` command.
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.
Valid option: String. Default: undef.
#####`version`
Sets the version of Java to install, if you want to ensure a particular version.
Valid options: 'present', 'installed', 'latest', or a string matching `/^[.+_0-9a-zA-Z:-]+$/`. Default: 'present'.
###Facts
The java module includes a few facts to describe the version of Java installed on the system:
* `java_major_version`: The major version of Java.
* `java_patch_level`: The patch level of Java.
* `java_version`: The full Java version string.
**Note:** The facts return `nil` if Java is not installed on the system.
##Limitations
This module cannot guarantee installation of Java versions that are not available on platform repositories.
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).
This module is officially [supported](https://forge.puppetlabs.com/supported) for the following Java versions and platforms:
OpenJDK is supported on:
* Red Hat Enterprise Linux (RHEL) 5, 6, 7
* CentOS 5, 6, 7
* Oracle Linux 6, 7
* Scientific Linux 5, 6
* Debian 6, 7
* Ubuntu 10.04, 12.04, 14.04
* Solaris 11
* SLES 11 SP1, 12
* OpenBSD 5.6, 5.7
Sun Java is supported on:
* Debian 6
### A note to 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.
##Development
Puppet Labs modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. We cant access the huge number of platforms and myriad hardware, software, and deployment configurations that Puppet is intended to serve. We want to keep it as easy as possible to contribute changes so that our modules work in your environment. There are a few guidelines that we need contributors to follow so that we can have a chance of keeping on top of things. For more information, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)
##Contributors
The list of contributors can be found at: [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors).

298
README.md Normal file
View File

@@ -0,0 +1,298 @@
# java
#### Table of Contents
1. [Overview](#overview)
2. [Module Description - What the module does and why it is useful](#module-description)
3. [Setup - The basics of getting started with the java module](#setup)
* [Beginning with the java module](#beginning-with-the-java-module)
4. [Usage - Configuration options and additional functionality](#usage)
5. [Reference - An under-the-hood peek at what the module is doing and how](#reference)
6. [Limitations - OS compatibility, etc.](#limitations)
7. [Development - Guide for contributing to the module](#development)
## Overview
Installs the correct Java package on various platforms.
## Module Description
The java module can automatically install Java jdk or jre on a wide variety of systems. Java is a base component for many software platforms, but Java system packages don't always follow packaging conventions. The java module simplifies the Java installation process.
## Setup
### Beginning with the java module
To install the correct Java package on your system, include the `java` class: `include java`.
## Usage
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:
```puppet
class { 'java':
distribution => 'jre',
}
```
To install the latest patch version of Java 8 on CentOS
```puppet
class { 'java' :
package => 'java-1.8.0-openjdk-devel',
}
```
The defined type `java::download` installs one or more versions of Java SE from a remote url. `java::download` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive).
To install Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat):
```puppet
java::download { 'jdk8' :
ensure => 'present',
java_se => 'jdk',
url => 'http://myjava.repository/java.tgz",
basedir => '/custom/java',
}
```
## AdoptOpenJDK
The defined type `java::adopt` installs one or more versions of AdoptOpenJDK Java. `java::adopt` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive).
```puppet
java::adopt { 'jdk8' :
ensure => 'present',
version => '8',
java => 'jdk',
}
java::adopt { 'jdk11' :
ensure => 'present',
version => '11',
java => 'jdk',
}
```
To install a specific release of a AdoptOpenJDK Java version, e.g. 8u202-b08, provide both parameters `version_major` and `version_minor` as follows:
```puppet
java::adopt { 'jdk8' :
ensure => 'present',
version_major => '8u202',
version_minor => 'b08',
java => 'jdk',
}
```
To install AdoptOpenJDK Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat):
```puppet
java::adopt { 'jdk8' :
ensure => 'present',
version_major => '8u202',
version_minor => 'b08',
java => 'jdk',
basedir => '/custom/java',
}
```
To ensure that a custom basedir is a directory before AdoptOpenJDK Java is installed (note: manage separately for custom ownership or perms):
```puppet
java::adopt { 'jdk8' :
ensure => 'present',
version_major => '8u202',
version_minor => 'b08',
java => 'jdk',
manage_basedir => true,
basedir => '/custom/java',
}
```
## Adoptium Temurin
Adoptium Temurin is the successor of AdoptOpenJDK and is supported using the defined type `java::adoptium`. It depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive).
The `java::adoptium` defined type expects a major, minor, patch and build version to download the specific release. It doesn't support jre downloads as the other distributions.
```puppet
java::adoptium { 'jdk16' :
ensure => 'present',
version_major => '16',
version_minor => '0',
version_patch => '2',
version_build => '7',
}
java::adoptium { 'jdk17' :
ensure => 'present',
version_major => '17',
version_minor => '0',
version_patch => '1',
version_build => '12',
}
```
To install Adoptium to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat):
```puppet
java::adoptium { 'jdk7' :
ensure => 'present',
version_major => '17',
version_minor => '0',
version_patch => '1',
version_build => '12',
basedir => '/custom/java',
}
```
To ensure that a custom basedir is a directory before Adoptium is installed (note: manage separately for custom ownership or perms):
```puppet
java::adoptium { 'jdk8' :
ensure => 'present',
version_major => '17',
version_minor => '0',
version_patch => '1',
version_build => '12',
manage_basedir => true,
basedir => '/custom/java',
}
```
## SAP Java (sapjvm / sapmachine)
SAP also offers JVM distributions. They are mostly required for their SAP products. In earlier versions it is called "sapjvm", in newer versions they call it "sapmachine".
The defined type `java::sap` installs one or more versions of sapjvm (if version 7 or 8) or sapmachine (if version > 8) Java. `java::sap` depends on [puppet/archive](https://github.com/voxpupuli/puppet-archive).
By using this defined type with versions 7 or 8 you agree with the EULA presented at https://tools.hana.ondemand.com/developer-license-3_1.txt!
```puppet
java::sap { 'sapjvm8' :
ensure => 'present',
version => '8',
java => 'jdk',
}
java::sap { 'sapmachine11' :
ensure => 'present',
version => '11',
java => 'jdk',
}
```
To install a specific release of a SAP Java version, e.g. sapjvm 8.1.063, provide parameter `version_full`:
```puppet
java::sap { 'jdk8' :
ensure => 'present',
version_full => '8.1.063',
java => 'jdk',
}
```
To install SAP Java to a non-default basedir (defaults: /usr/lib/jvm for Debian; /usr/java for RedHat):
```puppet
java::adopt { 'sapjvm8' :
ensure => 'present',
version_full => '8.1.063',
java => 'jdk',
basedir => '/custom/java',
}
```
To ensure that a custom basedir is a directory before SAP Java is installed (note: manage separately for custom ownership or perms):
```puppet
java::adopt { 'sapjvm8' :
ensure => 'present',
version_full => '8.1.063',
java => 'jdk',
manage_basedir => true,
basedir => '/custom/java',
}
```
## Reference
For information on the classes and types, see the [REFERENCE.md](https://github.com/puppetlabs/puppetlabs-java/blob/main/REFERENCE.md). For information on the facts, see below.
### Facts
The java module includes a few facts to describe the version of Java installed on the system:
* `java_major_version`: The major version of Java.
* `java_patch_level`: The patch level of Java.
* `java_version`: The full Java version string.
* `java_default_home`: The absolute path to the java system home directory (only available on Linux). For instance, the `java` executable's path would be `${::java_default_home}/jre/bin/java`. This is slightly different from the "standard" JAVA_HOME environment variable.
* `java_libjvm_path`: The absolute path to the directory containing the shared library `libjvm.so` (only available on Linux). Useful for setting `LD_LIBRARY_PATH` or configuring the dynamic linker.
**Note:** The facts return `nil` if Java is not installed on the system.
## Limitations
For an extensive list of supported operating systems, see [metadata.json](https://github.com/puppetlabs/puppetlabs-java/blob/main/metadata.json)
This module cannot guarantee installation of Java versions that are not available on platform repositories.
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 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:
OpenJDK is supported on:
* Red Hat Enterprise Linux (RHEL) 6, 7
* CentOS 6, 7
* Oracle Linux 6, 7
* Scientific Linux 6
* Debian 9
* Ubuntu 18.04, 20.04
* Solaris 11
* SLES 11, 12
Oracle Java is supported on:
* CentOS 6
* CentOS 7
* Red Hat Enterprise Linux (RHEL) 7
AdoptOpenJDK Java is supported on:
* CentOS
* Red Hat Enterprise Linux (RHEL)
* Amazon Linux
* Debian
Adoptium Temurin Java is supported on:
* CentOS
* Red Hat Enterprise Linux (RHEL)
* Amazon Linux
* Debian
SAP Java 7 and 8 (=sapjvm) are supported (by SAP) on:
* SLES 12, 15
* Oracle Linux 7, 8
* Red Hat Enterprise Linux (RHEL) 7, 8
(however installations on other distributions mostly also work well)
For SAP Java > 8 (=sapmachine) please refer to the OpenJDK list as it is based on OpenJDK and has no special requirements.
### Known issues
Where Oracle change the format of the URLs to different installer packages, the curl to fetch the package may fail with a HTTP/404 error. In this case, passing a full known good URL using the `url` parameter will allow the module to still be able to install specific versions of the JRE/JDK. Note the `version_major` and `version_minor` parameters must be passed and must match the version downloaded using the known URL in the `url` parameter.
#### 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 you upgrade Java to a newer
version, you have to update the path in this fact.
## Development
Puppet modules on the Puppet Forge are open projects, and community contributions are essential for keeping them great. To contribute to Puppet projects, see our [module contribution guide.](https://docs.puppetlabs.com/forge/contributing.html)
## Contributors
The list of contributors can be found at [https://github.com/puppetlabs/puppetlabs-java/graphs/contributors](https://github.com/puppetlabs/puppetlabs-java/graphs/contributors).

493
REFERENCE.md Normal file
View File

@@ -0,0 +1,493 @@
# Reference
<!-- DO NOT EDIT: This document was generated by Puppet Strings -->
## Table of Contents
### Classes
#### Public Classes
* [`java`](#java): This module manages the Java runtime package
#### Private Classes
* `java::config`
* `java::params`: This class builds a hash of JDK/JRE packages and (for Debian)
alternatives. For wheezy/precise, we provide Oracle JDK/JRE
options, even though those are not in the package repositories.
### Defined types
* [`java::adopt`](#javaadopt): Install one or more versions of AdoptOpenJDK Java.
* [`java::download`](#javadownload): Installs Java from a url location.
* [`java::sap`](#javasap): Install one or more versions of SAPJVM or Sapmachine
## Classes
### <a name="java"></a>`java`
This module manages the Java runtime package
#### Parameters
The following parameters are available in the `java` class:
* [`distribution`](#distribution)
* [`version`](#version)
* [`package`](#package)
* [`package_options`](#package_options)
* [`java_alternative`](#java_alternative)
* [`java_alternative_path`](#java_alternative_path)
* [`java_home`](#java_home)
##### <a name="distribution"></a>`distribution`
Data type: `String`
The java distribution to install. Can be one of "jdk" or "jre",
or other platform-specific options where there are multiple
implementations available (eg: OpenJDK vs Oracle JDK).
Default value: `'jdk'`
##### <a name="version"></a>`version`
Data type: `Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/]`
The version of java to install. By default, this module simply ensures
that java is present, and does not require a specific version.
Default value: `'present'`
##### <a name="package"></a>`package`
Data type: `Optional[String]`
The name of the java package. This is configurable in case a non-standard
java package is desired.
Default value: ``undef``
##### <a name="package_options"></a>`package_options`
Data type: `Optional[Array]`
Array of strings to pass installation options to the 'package' Puppet resource.
Options available depend on the 'package' provider for the target OS.
Default value: ``undef``
##### <a name="java_alternative"></a>`java_alternative`
Data type: `Optional[String]`
The name of the java alternative to use on Debian systems.
"update-java-alternatives -l" will show which choices are available.
If you specify a particular package, you will almost always also
want to specify which java_alternative to choose. If you set
this, you also need to set the path below.
Default value: ``undef``
##### <a name="java_alternative_path"></a>`java_alternative_path`
Data type: `Optional[String]`
The path to the "java" command on Debian systems. Since the
alternatives system makes it difficult to verify which
alternative is actually enabled, this is required to ensure the
correct JVM is enabled.
Default value: ``undef``
##### <a name="java_home"></a>`java_home`
Data type: `Optional[String]`
The path to where the JRE is installed. This will be set as an
environment variable.
Default value: ``undef``
## Defined types
### <a name="javaadopt"></a>`java::adopt`
Defined Type java::adopt
#### Parameters
The following parameters are available in the `java::adopt` defined type:
* [`ensure`](#ensure)
* [`version`](#version)
* [`version_major`](#version_major)
* [`version_minor`](#version_minor)
* [`java`](#java)
* [`proxy_server`](#proxy_server)
* [`proxy_type`](#proxy_type)
* [`url`](#url)
* [`basedir`](#basedir)
* [`manage_basedir`](#manage_basedir)
* [`package_type`](#package_type)
* [`manage_symlink`](#manage_symlink)
* [`symlink_name`](#symlink_name)
##### <a name="ensure"></a>`ensure`
Data type: `Any`
Install or remove the package.
Default value: `'present'`
##### <a name="version"></a>`version`
Data type: `Any`
Version of Java to install, e.g. '8' or '9'. Default values for major and minor versions will be used.
Default value: `'8'`
##### <a name="version_major"></a>`version_major`
Data type: `Any`
Major version which should be installed, e.g. '8u101' or '9.0.4'. Must be used together with version_minor.
Default value: ``undef``
##### <a name="version_minor"></a>`version_minor`
Data type: `Any`
Minor version which should be installed, e.g. 'b12' (for version = '8') or '11' (for version != '8'). Must be used together with version_major.
Default value: ``undef``
##### <a name="java"></a>`java`
Data type: `Any`
Type of Java Standard Edition to install, jdk or jre.
Default value: `'jdk'`
##### <a name="proxy_server"></a>`proxy_server`
Data type: `Any`
Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
Default value: ``undef``
##### <a name="proxy_type"></a>`proxy_type`
Data type: `Any`
Proxy server type (none|http|https|ftp). (passed to archive)
Default value: ``undef``
##### <a name="url"></a>`url`
Data type: `Any`
Full URL
Default value: ``undef``
##### <a name="basedir"></a>`basedir`
Data type: `Any`
Directory under which the installation will occur. If not set, defaults to
/usr/lib/jvm for Debian and /usr/java for RedHat.
Default value: ``undef``
##### <a name="manage_basedir"></a>`manage_basedir`
Data type: `Any`
Whether to manage the basedir directory. Defaults to false.
Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
Default value: ``true``
##### <a name="package_type"></a>`package_type`
Data type: `Any`
Type of installation package for specified version of java_se. java_se 6 comes
in a few installation package flavors and we need to account for them.
Optional forced package types: rpm, rpmbin, tar.gz
Default value: ``undef``
##### <a name="manage_symlink"></a>`manage_symlink`
Data type: `Any`
Whether to manage a symlink that points to the installation directory. Defaults to false.
Default value: ``false``
##### <a name="symlink_name"></a>`symlink_name`
Data type: `Any`
The name for the optional symlink in the installation directory.
Default value: ``undef``
### <a name="javadownload"></a>`java::download`
Defined Type java::download
#### Parameters
The following parameters are available in the `java::download` defined type:
* [`ensure`](#ensure)
* [`version`](#version)
* [`version_major`](#version_major)
* [`version_minor`](#version_minor)
* [`java_se`](#java_se)
* [`proxy_server`](#proxy_server)
* [`proxy_type`](#proxy_type)
* [`url`](#url)
* [`jce`](#jce)
* [`jce_url`](#jce_url)
* [`basedir`](#basedir)
* [`manage_basedir`](#manage_basedir)
* [`package_type`](#package_type)
* [`manage_symlink`](#manage_symlink)
* [`symlink_name`](#symlink_name)
##### <a name="ensure"></a>`ensure`
Data type: `Any`
Install or remove the package.
Default value: `'present'`
##### <a name="version"></a>`version`
Data type: `Any`
Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used.
Default value: `'8'`
##### <a name="version_major"></a>`version_major`
Data type: `Any`
Major version which should be installed, e.g. '8u101'. Must be used together with version_minor.
Default value: ``undef``
##### <a name="version_minor"></a>`version_minor`
Data type: `Any`
Minor version which should be installed, e.g. 'b12'. Must be used together with version_major.
Default value: ``undef``
##### <a name="java_se"></a>`java_se`
Data type: `Any`
Type of Java Standard Edition to install, jdk or jre.
Default value: `'jdk'`
##### <a name="proxy_server"></a>`proxy_server`
Data type: `Any`
Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
Default value: ``undef``
##### <a name="proxy_type"></a>`proxy_type`
Data type: `Any`
Proxy server type (none|http|https|ftp). (passed to archive)
Default value: ``undef``
##### <a name="url"></a>`url`
Data type: `Any`
Full URL
Default value: ``undef``
##### <a name="jce"></a>`jce`
Data type: `Any`
Install Oracles Java Cryptographic Extensions into the JRE or JDK
Default value: ``false``
##### <a name="jce_url"></a>`jce_url`
Data type: `Any`
Full URL to the jce zip file
Default value: ``undef``
##### <a name="basedir"></a>`basedir`
Data type: `Any`
Directory under which the installation will occur. If not set, defaults to
/usr/lib/jvm for Debian and /usr/java for RedHat.
Default value: ``undef``
##### <a name="manage_basedir"></a>`manage_basedir`
Data type: `Any`
Whether to manage the basedir directory. Defaults to false.
Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
Default value: ``false``
##### <a name="package_type"></a>`package_type`
Data type: `Any`
Type of installation package for specified version of java_se. java_se 6 comes
in a few installation package flavors and we need to account for them.
Optional forced package types: rpm, rpmbin, tar.gz
Default value: ``undef``
##### <a name="manage_symlink"></a>`manage_symlink`
Data type: `Any`
Whether to manage a symlink that points to the installation directory. Defaults to false.
Default value: ``false``
##### <a name="symlink_name"></a>`symlink_name`
Data type: `Any`
The name for the optional symlink in the installation directory.
Default value: ``undef``
### <a name="javasap"></a>`java::sap`
Defined Type java::sap
#### Parameters
The following parameters are available in the `java::sap` defined type:
* [`ensure`](#ensure)
* [`version`](#version)
* [`version_full`](#version_full)
* [`java`](#java)
* [`proxy_server`](#proxy_server)
* [`proxy_type`](#proxy_type)
* [`basedir`](#basedir)
* [`manage_basedir`](#manage_basedir)
* [`manage_symlink`](#manage_symlink)
* [`symlink_name`](#symlink_name)
##### <a name="ensure"></a>`ensure`
Data type: `Any`
Install or remove the package.
Default value: `'present'`
##### <a name="version"></a>`version`
Data type: `Any`
Version of Java to install, e.g. '8' or '9'. Default values for full versions will be used.
Default value: `'8'`
##### <a name="version_full"></a>`version_full`
Data type: `Any`
Major version which should be installed, e.g. '8.1.063' or '11.0.7'. If used, "version" parameter is ignored.
Default value: ``undef``
##### <a name="java"></a>`java`
Data type: `Any`
Type of Java Edition to install, jdk or jre.
Default value: `'jdk'`
##### <a name="proxy_server"></a>`proxy_server`
Data type: `Any`
Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
Default value: ``undef``
##### <a name="proxy_type"></a>`proxy_type`
Data type: `Any`
Proxy server type (none|http|https|ftp). (passed to archive)
Default value: ``undef``
##### <a name="basedir"></a>`basedir`
Data type: `Any`
Directory under which the installation will occur. If not set, defaults to
/usr/lib/jvm for Debian and /usr/java for RedHat.
Default value: ``undef``
##### <a name="manage_basedir"></a>`manage_basedir`
Data type: `Any`
Whether to manage the basedir directory. Defaults to false.
Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
Default value: ``true``
##### <a name="manage_symlink"></a>`manage_symlink`
Data type: `Any`
Whether to manage a symlink that points to the installation directory. Defaults to false.
Default value: ``false``
##### <a name="symlink_name"></a>`symlink_name`
Data type: `Any`
The name for the optional symlink in the installation directory.
Default value: ``undef``

View File

@@ -1,10 +1,89 @@
require 'puppetlabs_spec_helper/rake_tasks' # frozen_string_literal: true
require 'puppet-lint/tasks/puppet-lint'
require 'bundler'
require 'puppet_litmus/rake_tasks' if Bundler.rubygems.find_name('puppet_litmus').any?
require 'puppetlabs_spec_helper/rake_tasks'
require 'puppet-syntax/tasks/puppet-syntax'
require 'puppet_blacksmith/rake_tasks' if Bundler.rubygems.find_name('puppet-blacksmith').any?
require 'github_changelog_generator/task' if Bundler.rubygems.find_name('github_changelog_generator').any?
require 'puppet-strings/tasks' if Bundler.rubygems.find_name('puppet-strings').any?
def changelog_user
return unless Rake.application.top_level_tasks.include? "changelog"
returnVal = nil || JSON.load(File.read('metadata.json'))['author']
raise "unable to find the changelog_user in .sync.yml, or the author in metadata.json" if returnVal.nil?
puts "GitHubChangelogGenerator user:#{returnVal}"
returnVal
end
def changelog_project
return unless Rake.application.top_level_tasks.include? "changelog"
returnVal = nil
returnVal ||= begin
metadata_source = JSON.load(File.read('metadata.json'))['source']
metadata_source_match = metadata_source && metadata_source.match(%r{.*\/([^\/]*?)(?:\.git)?\Z})
metadata_source_match && metadata_source_match[1]
end
raise "unable to find the changelog_project in .sync.yml or calculate it from the source in metadata.json" if returnVal.nil?
puts "GitHubChangelogGenerator project:#{returnVal}"
returnVal
end
def changelog_future_release
return unless Rake.application.top_level_tasks.include? "changelog"
returnVal = "v%s" % JSON.load(File.read('metadata.json'))['version']
raise "unable to find the future_release (version) in metadata.json" if returnVal.nil?
puts "GitHubChangelogGenerator future_release:#{returnVal}"
returnVal
end
PuppetLint.configuration.send('disable_relative')
if Bundler.rubygems.find_name('github_changelog_generator').any?
GitHubChangelogGenerator::RakeTask.new :changelog do |config|
raise "Set CHANGELOG_GITHUB_TOKEN environment variable eg 'export CHANGELOG_GITHUB_TOKEN=valid_token_here'" if Rake.application.top_level_tasks.include? "changelog" and ENV['CHANGELOG_GITHUB_TOKEN'].nil?
config.user = "#{changelog_user}"
config.project = "#{changelog_project}"
config.future_release = "#{changelog_future_release}"
config.exclude_labels = ['maintenance']
config.header = "# Change log\n\nAll notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org)."
config.add_pr_wo_labels = true
config.issues = false
config.merge_prefix = "### UNCATEGORIZED PRS; LABEL THEM ON GITHUB"
config.configure_sections = {
"Changed" => {
"prefix" => "### Changed",
"labels" => ["backwards-incompatible"],
},
"Added" => {
"prefix" => "### Added",
"labels" => ["enhancement", "feature"],
},
"Fixed" => {
"prefix" => "### Fixed",
"labels" => ["bug", "documentation", "bugfix"],
},
}
end
else
desc 'Generate a Changelog from GitHub'
task :changelog do
raise <<EOM
The changelog tasks depends on recent features of the github_changelog_generator gem.
Please manually add it to your .sync.yml for now, and run `pdk update`:
---
Gemfile:
optional:
':development':
- gem: 'github_changelog_generator'
version: '~> 1.15'
condition: "Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.3.0')"
EOM
end
end
PuppetLint.configuration.fail_on_warnings = true
PuppetLint.configuration.send('relative')
PuppetLint.configuration.send('disable_80chars')
PuppetLint.configuration.send('disable_class_inherits_from_params_class')
PuppetLint.configuration.send('disable_documentation')
PuppetLint.configuration.send('disable_single_quote_string_with_variables')
PuppetLint.configuration.ignore_paths = ["spec/**/*.pp", "pkg/**/*.pp"]

1
data/common.yaml Normal file
View File

@@ -0,0 +1 @@
--- {}

View File

@@ -1,5 +1,5 @@
class { 'java': class { 'java':
package => 'jdk-8u25-linux-x64', package => 'jdk-8u25-linux-x64',
java_alternative => 'jdk1.8.0_25', java_alternative => 'jdk1.8.0_25',
java_alternative_path => '/usr/java/jdk1.8.0_25/jre/bin/java' java_alternative_path => '/usr/java/jdk1.8.0_25/jre/bin/java',
} }

5
examples/oracle.pp Normal file
View File

@@ -0,0 +1,5 @@
java::oracle { 'jdk6' :
ensure => 'present',
version => '6',
java_se => 'jdk',
}

21
hiera.yaml Normal file
View File

@@ -0,0 +1,21 @@
---
version: 5
defaults: # Used for any hierarchy level that omits these keys.
datadir: data # This path is relative to hiera.yaml's directory.
data_hash: yaml_data # Use the built-in YAML backend.
hierarchy:
- name: "osfamily/major release"
paths:
# Used to distinguish between Debian and Ubuntu
- "os/%{facts.os.name}/%{facts.os.release.major}.yaml"
- "os/%{facts.os.family}/%{facts.os.release.major}.yaml"
# Used for Solaris
- "os/%{facts.os.family}/%{facts.kernelrelease}.yaml"
- name: "osfamily"
paths:
- "os/%{facts.os.name}.yaml"
- "os/%{facts.os.family}.yaml"
- name: 'common'
path: 'common.yaml'

View File

@@ -0,0 +1,32 @@
# frozen_string_literal: true
# Fact: java_default_home
#
# Purpose: get absolute path of java system home
#
# Resolution:
# Find the real java binary, and return the subsubdir
#
# Caveats:
# java binary has to be found in $PATH
#
# Notes:
# None
Facter.add(:java_default_home) do
confine kernel: ['Linux', 'OpenBSD']
java_default_home = nil
setcode do
java_bin = Facter::Util::Resolution.which('java').to_s.strip
if java_bin.empty?
nil
else
java_path = File.realpath(java_bin)
java_default_home = if %r{/jre/}.match?(java_path)
File.dirname(File.dirname(File.dirname(java_path)))
else
File.dirname(File.dirname(java_path))
end
end
end
java_default_home
end

View File

@@ -0,0 +1,34 @@
# frozen_string_literal: true
# Fact: java_libjvm_path
#
# Purpose: get path to libjvm.so
#
# Resolution:
# Lists file in java default home and searches for the file
#
# Caveats:
# Needs to list files recursively. Returns the first match
# Needs working java_major_version fact
#
# Notes:
# None
Facter.add(:java_libjvm_path) do
confine kernel: ['Linux', 'OpenBSD']
setcode do
java_default_home = Facter.value(:java_default_home)
java_major_version = Facter.value(:java_major_version)
unless java_major_version.nil?
java_libjvm_file = if java_major_version.to_i >= 11
Dir.glob("#{java_default_home}/lib/**/libjvm.so")
else
Dir.glob("#{java_default_home}/jre/lib/**/libjvm.so")
end
if java_libjvm_file.nil? || java_libjvm_file.empty?
nil
else
File.dirname(java_libjvm_file[0])
end
end
end
end

View File

@@ -1,3 +1,5 @@
# frozen_string_literal: true
# Fact: java_major_version # Fact: java_major_version
# #
# Purpose: get Java's major version # Purpose: get Java's major version
@@ -13,8 +15,16 @@
# Notes: # Notes:
# None # None
Facter.add(:java_major_version) do Facter.add(:java_major_version) do
java_major_version = nil
setcode do setcode do
java_version = Facter.value(:java_version) java_version = Facter.value(:java_version)
java_patch_level = java_version.strip.split('_')[0].split('.')[1] unless java_version.nil? unless java_version.nil?
java_major_version = if java_version.strip[0..1] == '1.'
java_version.strip.split('_')[0].split('.')[1]
else
java_version.strip.split('.')[0]
end end
end
end
java_major_version
end end

View File

@@ -1,9 +1,11 @@
# frozen_string_literal: true
# Fact: java_patch_level # Fact: java_patch_level
# #
# Purpose: get Java's patch level # Purpose: get Java's patch level
# #
# Resolution: # Resolution:
# Uses java_version fact splits on the patch number (after _) # Uses java_version fact splits on the patch number (after _ for 1.x and patch number for semver'ed javas)
# #
# Caveats: # Caveats:
# none # none
@@ -11,8 +13,16 @@
# Notes: # Notes:
# None # None
Facter.add(:java_patch_level) do Facter.add(:java_patch_level) do
java_patch_level = nil
setcode do setcode do
java_version = Facter.value(:java_version) java_version = Facter.value(:java_version)
unless java_version.nil?
if java_version.strip[0..1] == '1.'
java_patch_level = java_version.strip.split('_')[1] unless java_version.nil? java_patch_level = java_version.strip.split('_')[1] unless java_version.nil?
else
java_patch_level = java_version.strip.split('.')[2] unless java_version.nil?
end end
end
end
java_patch_level
end end

View File

@@ -1,10 +1,12 @@
# frozen_string_literal: true
# Fact: java_version # Fact: java_version
# #
# Purpose: get full java version string # Purpose: get full java version string
# #
# Resolution: # Resolution:
# Tests for presence of java, returns nil if not present # Tests for presence of java, returns nil if not present
# returns output of "java -version" and splits on \n + '"' # returns output of "java -version" and splits on '"'
# #
# Caveats: # Caveats:
# none # none
@@ -21,32 +23,24 @@ Facter.add(:java_version) do
# Additionally, facter versions prior to 2.0.1 only support # Additionally, facter versions prior to 2.0.1 only support
# positive matches, so this needs to be done manually in setcode. # positive matches, so this needs to be done manually in setcode.
setcode do setcode do
unless [ 'openbsd', 'darwin' ].include? Facter.value(:operatingsystem).downcase unless ['darwin'].include? Facter.value(:kernel).downcase
version = nil
if Facter::Util::Resolution.which('java') if Facter::Util::Resolution.which('java')
Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = Regexp.last_match(1) if %r{^.+ version \"(.+)\"} =~ line }
end end
version
end end
end end
end end
Facter.add(:java_version) do Facter.add(:java_version) do
confine :operatingsystem => 'OpenBSD' confine kernel: 'Darwin'
has_weight 100 has_weight 100
setcode do setcode do
Facter::Util::Resolution.with_env("PATH" => '/usr/local/jdk-1.7.0/jre/bin:/usr/local/jre-1.7.0/bin') do unless Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1').include?('Unable to find any JVMs matching version')
if Facter::Util::Resolution.which('java') version = nil
Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip Facter::Util::Resolution.exec('java -Xmx12m -version 2>&1').lines.each { |line| version = Regexp.last_match(1) if %r{^.+ version \"(.+)\"} =~ line }
end version
end
end
end
Facter.add(:java_version) do
confine :operatingsystem => 'Darwin'
has_weight 100
setcode do
unless /Unable to find any JVMs matching version/ =~ Facter::Util::Resolution.exec('/usr/libexec/java_home --failfast 2>&1')
Facter::Util::Resolution.exec('java -Xmx8m -version 2>&1').lines.first.split(/"/)[1].strip
end end
end end
end end

324
manifests/adopt.pp Normal file
View File

@@ -0,0 +1,324 @@
# Defined Type java::adopt
#
# @summary
# Install one or more versions of AdoptOpenJDK Java.
#
# @param ensure
# Install or remove the package.
#
# @param version
# Version of Java to install, e.g. '8' or '9'. Default values for major and minor versions will be used.
#
# @param version_major
# Major version which should be installed, e.g. '8u101' or '9.0.4'. Must be used together with version_minor.
#
# @param version_minor
# Minor version which should be installed, e.g. 'b12' (for version = '8') or '11' (for version != '8'). Must be used together with version_major.
#
# @param java
# Type of Java Standard Edition to install, jdk or jre.
#
# @param proxy_server
# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
#
# @param proxy_type
# Proxy server type (none|http|https|ftp). (passed to archive)
#
# @param url
# Full URL
#
# @param basedir
# Directory under which the installation will occur. If not set, defaults to
# /usr/lib/jvm for Debian and /usr/java for RedHat.
#
# @param manage_basedir
# Whether to manage the basedir directory. Defaults to false.
# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
#
# @param package_type
# Type of installation package for specified version of java_se. java_se 6 comes
# in a few installation package flavors and we need to account for them.
# Optional forced package types: rpm, rpmbin, tar.gz
#
# @param manage_symlink
# Whether to manage a symlink that points to the installation directory. Defaults to false.
#
# @param symlink_name
# The name for the optional symlink in the installation directory.
#
define java::adopt (
$ensure = 'present',
$version = '8',
$version_major = undef,
$version_minor = undef,
$java = 'jdk',
$proxy_server = undef,
$proxy_type = undef,
$url = undef,
$basedir = undef,
$manage_basedir = true,
$package_type = undef,
$manage_symlink = false,
$symlink_name = undef,
) {
# archive module is used to download the java package
include ::archive
# validate java Standard Edition to download
if $java !~ /(jre|jdk)/ {
fail('java must be either jre or jdk.')
}
# determine AdoptOpenJDK Java major and minor version, and installation path
if $version_major and $version_minor {
$release_major = $version_major
$release_minor = $version_minor
if ( $version_major[0] == '8' or $version_major[0] == '9' ) {
$_version = $version_major[0]
} else {
$_version = $version_major[0,2]
}
$_version_int = Numeric($_version)
if ( $java == 'jre' ) {
$_append_jre = '-jre'
} else {
$_append_jre = ''
}
# extracted folders look like this:
# jdk8u202-b08
# jdk-9.0.4+11
# jdk-10.0.2+13
# jdk-11.0.2+9
# jdk-12.0.1+12
# jdk8u202-b08-jre
# jdk-9.0.4+11-jre
# hence we need to check for the major version and build the install path according to it
if ( $_version_int == 8 ) {
$install_path = "jdk${release_major}-${release_minor}${_append_jre}"
} elsif ( $_version_int > 8 ) {
$install_path = "jdk-${release_major}+${release_minor}${_append_jre}"
} else {
fail ("unsupported version ${_version}")
}
} else {
$_version = $version
$_version_int = Numeric($_version)
# use default versions if no specific major and minor version parameters are provided
case $version {
'8' : {
$release_major = '8u202'
$release_minor = 'b08'
$install_path = "${java}8u202-b08"
}
'9' : {
$release_major = '9.0.4'
$release_minor = '11'
$install_path = "${java}-9.0.4+11"
}
# minor release is given with +<number>, however package etc. works with underscore, so we use underscore here
'10' : {
$release_major = '10.0.2'
$release_minor = '13'
$install_path = "${java}-10.0.2+13"
}
'11' : {
$release_major = '11.0.2'
$release_minor = '9'
$install_path = "${java}-11.0.2+9"
}
# minor release is given with +<number>, however package etc. works with underscore, so we use underscore here
'12' : {
$release_major = '12.0.1'
$release_minor = '12'
$install_path = "${java}-12.0.1+12"
}
default : {
$release_major = '8u202'
$release_minor = 'b08'
$install_path = "${java}8u202-b08"
}
}
}
# determine package type (exe/tar/rpm), destination directory based on OS
case $facts['kernel'] {
'Linux' : {
case $facts['os']['family'] {
'RedHat', 'Amazon' : {
if $package_type {
$_package_type = $package_type
} else {
$_package_type = 'tar.gz'
}
if $basedir {
$_basedir = $basedir
} else {
$_basedir = '/usr/java'
}
}
'Debian' : {
if $package_type {
$_package_type = $package_type
} else {
$_package_type = 'tar.gz'
}
if $basedir {
$_basedir = $basedir
} else {
$_basedir = '/usr/lib/jvm'
}
}
default : {
fail ("unsupported platform ${$facts['os']['name']}") }
}
$creates_path = "${_basedir}/${install_path}"
$os = 'linux'
$destination_dir = '/tmp/'
}
default : {
fail ( "unsupported platform ${$facts['kernel']}" ) }
}
# set java architecture nomenclature
$os_architecture = $facts['os']['architecture'] ? {
undef => $facts['architecture'],
default => $facts['os']['architecture']
}
case $os_architecture {
'i386' : { $arch = 'x86-32' }
'x86_64' : { $arch = 'x64' }
'amd64' : { $arch = 'x64' }
default : {
fail ("unsupported platform ${$os_architecture}")
}
}
# package name and path for download from github
#
# following are build based on this real life example full URLs:
#
# https://github.com/AdoptOpenJDK/openjdk8-binaries/releases/download/jdk8u202-b08/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz
# https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz
# https://github.com/AdoptOpenJDK/openjdk10-binaries/releases/download/jdk-10.0.2%2B13/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz
# https://github.com/AdoptOpenJDK/openjdk11-binaries/releases/download/jdk-11.0.2%2B9/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz
# https://github.com/AdoptOpenJDK/openjdk12-binaries/releases/download/jdk-12.0.1%2B12/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz
# jre just replaces jdk with jre in the archive name, but not in the path name!
# https://github.com/AdoptOpenJDK/openjdk9-binaries/releases/download/jdk-9.0.4%2B11/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz
if ( $_version_int == 8 ) {
$_release_minor_package_name = $release_minor
} else {
$_release_minor_package_name = "_${release_minor}"
}
case $_package_type {
'tar.gz': {
$package_name = "OpenJDK${_version}U-${java}_${arch}_${os}_hotspot_${release_major}${_release_minor_package_name}.tar.gz"
}
default: {
$package_name = "OpenJDK${_version}U-${java}_${arch}_${os}_hotspot_${release_major}${_release_minor_package_name}.tar.gz"
}
}
# naming convention changed after major version 8, setting variables to consider that
# download_folder_prefix always begins with "jdk", even for jre! see comments for package_name above
if ( $_version_int == 8 ) {
$spacer = '-'
$download_folder_prefix = 'jdk'
} else {
$spacer = '%2B'
$download_folder_prefix = 'jdk-'
}
# if complete URL is provided, use this value for source in archive resource
if $url {
$source = $url
}
else {
$source = "https://github.com/AdoptOpenJDK/openjdk${_version}-binaries/releases/download/${download_folder_prefix}${release_major}${spacer}${release_minor}/${package_name}"
notice ("Default source url : ${source}")
}
# full path to the installer
$destination = "${destination_dir}${package_name}"
notice ("Destination is ${destination}")
case $_package_type {
'tar.gz' : {
$install_command = "tar -zxf ${destination} -C ${_basedir}"
}
default : {
$install_command = "tar -zxf ${destination} -C ${_basedir}"
}
}
case $ensure {
'present' : {
archive { $destination :
ensure => present,
source => $source,
extract_path => '/tmp',
cleanup => false,
creates => $creates_path,
proxy_server => $proxy_server,
proxy_type => $proxy_type,
}
case $facts['kernel'] {
'Linux' : {
case $facts['os']['family'] {
'Debian' : {
ensure_resource('file', $_basedir, {
ensure => directory,
})
$install_requires = [Archive[$destination], File[$_basedir]]
}
default : {
$install_requires = [Archive[$destination]]
}
}
if $manage_basedir {
if (!defined(File[$_basedir])) {
file { $_basedir:
ensure => 'directory',
before => Exec["Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}"],
}
}
}
exec { "Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}" :
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
command => $install_command,
creates => $creates_path,
require => $install_requires
}
if ($manage_symlink and $symlink_name) {
file { "${_basedir}/${symlink_name}":
ensure => link,
target => $creates_path,
require => Exec["Install AdoptOpenJDK java ${java} ${_version} ${release_major} ${release_minor}"],
}
}
}
default : {
fail ("unsupported platform ${$facts['kernel']}")
}
}
}
default : {
notice ("Action ${ensure} not supported.")
}
}
}

190
manifests/adoptium.pp Normal file
View File

@@ -0,0 +1,190 @@
# Defined Type java::adoptium
#
# @summary
# Install one or more versions of Adoptium Temurin OpenJDK (former AdoptOpenJDK).
#
# @param ensure
# Install or remove the package.
#
# @param version_major
# Major version which should be installed, e.g. '16' or '17'
#
# @param version_minor
# Minor version which should be installed, e.g. '0'
#
# @param version_patch
# Minor version which should be installed, e.g. '2'
#
# @param version_build
# Build version which should be installed, e.g. '07'
#
# @param proxy_server
# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
#
# @param proxy_type
# Proxy server type (none|http|https|ftp). (passed to archive)
#
# @param url
# Full URL
#
# @param basedir
# Directory under which the installation will occur. If not set, defaults to
# /usr/lib/jvm for Debian and /usr/java for RedHat.
#
# @param manage_basedir
# Whether to manage the basedir directory. Defaults to false.
# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
#
# @param manage_symlink
# Whether to manage a symlink that points to the installation directory. Defaults to false.
#
# @param symlink_name
# The name for the optional symlink in the installation directory.
#
define java::adoptium (
$ensure = 'present',
$version_major = undef,
$version_minor = undef,
$version_patch = undef,
$version_build = undef,
$proxy_server = undef,
$proxy_type = undef,
$url = undef,
$basedir = undef,
$manage_basedir = true,
$manage_symlink = false,
$symlink_name = undef,
) {
# archive module is used to download the java package
include ::archive
$install_path = "jdk-${version_major}.${version_minor}.${version_patch}+${version_build}"
# determine package type (exe/tar/rpm), destination directory based on OS
case $facts['kernel'] {
'Linux' : {
case $facts['os']['family'] {
'RedHat', 'Amazon' : {
if $basedir {
$_basedir = $basedir
} else {
$_basedir = '/usr/java'
}
}
'Debian' : {
if $basedir {
$_basedir = $basedir
} else {
$_basedir = '/usr/lib/jvm'
}
}
default : {
fail ("unsupported platform ${$facts['os']['name']}") }
}
$creates_path = "${_basedir}/${install_path}"
$os = 'linux_hotspot'
}
default : {
fail ( "unsupported platform ${$facts['kernel']}" ) }
}
# set java architecture nomenclature
$os_architecture = $facts['os']['architecture'] ? {
undef => $facts['architecture'],
default => $facts['os']['architecture']
}
case $os_architecture {
'i386' : { $arch = 'x86-32' }
'x86_64' : { $arch = 'x64' }
'amd64' : { $arch = 'x64' }
default : {
fail ("unsupported platform ${$os_architecture}")
}
}
# package name and path for download from github
#
# following are build based on this real life example full URLs:
#
# https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.1%2B12/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz
# https://github.com/adoptium/temurin16-binaries/releases/download/jdk-16.0.2%2B7/OpenJDK16U-jdk_x64_alpine-linux_hotspot_16.0.2_7.tar.gz
$package_name = "OpenJDK${version_major}U-jdk_${arch}_${os}_${version_major}.${version_minor}.${version_patch}_${version_build}.tar.gz"
# if complete URL is provided, use this value for source in archive resource
if $url {
$source = $url
}
else {
$source = "https://github.com/adoptium/temurin${version_major}-binaries/releases/download/jdk-${version_major}.${version_minor}.${version_patch}%2B${version_build}/${package_name}"
notice ("Default source url : ${source}")
}
# full path to the installer
$destination = "/tmp/${package_name}"
notice ("Destination is ${destination}")
case $ensure {
'present' : {
archive { $destination :
ensure => present,
source => $source,
extract_path => '/tmp',
cleanup => false,
creates => $creates_path,
proxy_server => $proxy_server,
proxy_type => $proxy_type,
}
case $facts['kernel'] {
'Linux' : {
case $facts['os']['family'] {
'Debian' : {
ensure_resource('file', $_basedir, {
ensure => directory,
})
$install_requires = [Archive[$destination], File[$_basedir]]
}
default : {
$install_requires = [Archive[$destination]]
}
}
if $manage_basedir {
if (!defined(File[$_basedir])) {
file { $_basedir:
ensure => 'directory',
before => Exec["Install Adoptium Temurin java ${version_major} ${version_minor} ${version_patch} ${version_build}"],
}
}
}
exec { "Install Adoptium Temurin java ${version_major} ${version_minor} ${version_patch} ${version_build}" :
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
command => "tar -zxf ${destination} -C ${_basedir}",
creates => $creates_path,
require => $install_requires
}
if ($manage_symlink and $symlink_name) {
file { "${_basedir}/${symlink_name}":
ensure => link,
target => $creates_path,
require => Exec["Install Adoptium Temurin java ${version_major} ${version_minor} ${version_patch} ${version_build}"],
}
}
}
default : {
fail ("unsupported platform ${$facts['kernel']}")
}
}
}
default : {
notice ("Action ${ensure} not supported.")
}
}
}

View File

@@ -1,6 +1,6 @@
# On Debian systems, if alternatives are set, manually assign them. # @api private
class java::config ( ) { class java::config ( ) {
case $::osfamily { case $facts['os']['family'] {
'Debian': { 'Debian': {
if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef { if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef {
exec { 'update-java-alternatives': exec { 'update-java-alternatives':
@@ -9,6 +9,13 @@ class java::config ( ) {
unless => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'", unless => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'",
} }
} }
if $java::use_java_home != undef {
file_line { 'java-home-environment':
path => '/etc/environment',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
} }
'RedHat': { 'RedHat': {
if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef { if $java::use_java_alternative != undef and $java::use_java_alternative_path != undef {
@@ -19,7 +26,7 @@ class java::config ( ) {
path => '/usr/bin:/usr/sbin:/bin:/sbin', path => '/usr/bin:/usr/sbin:/bin:/sbin',
command => "alternatives --install /usr/bin/java java ${$java::use_java_alternative_path} 20000" , command => "alternatives --install /usr/bin/java java ${$java::use_java_alternative_path} 20000" ,
unless => "alternatives --display java | grep -q ${$java::use_java_alternative_path}", unless => "alternatives --display java | grep -q ${$java::use_java_alternative_path}",
before => Exec['update-java-alternatives'] before => Exec['update-java-alternatives'],
} }
} }
@@ -29,6 +36,54 @@ class java::config ( ) {
unless => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'", unless => "test /etc/alternatives/java -ef '${java::use_java_alternative_path}'",
} }
} }
if $java::use_java_home != undef {
file_line { 'java-home-environment':
path => '/etc/environment',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
}
'Suse': {
if $java::use_java_home != undef {
file_line { 'java-home-environment':
path => '/etc/environment',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
}
'FreeBSD': {
if $java::use_java_home != undef {
file_line { 'java-home-environment-profile':
path => '/etc/profile',
line => "JAVA_HOME=${$java::use_java_home}; export JAVA_HOME",
match => 'JAVA_HOME=',
}
file_line { 'java-home-environment-cshrc':
path => '/etc/csh.login',
line => "setenv JAVA_HOME ${$java::use_java_home}",
match => 'setenv JAVA_HOME',
}
}
}
'Solaris': {
if $java::use_java_home != undef {
file_line { 'java-home-environment':
path => '/etc/profile',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
}
'Archlinux': {
if $java::use_java_home != undef {
file_line { 'java-home-environment':
path => '/etc/profile',
line => "JAVA_HOME=${$java::use_java_home}",
match => 'JAVA_HOME=',
}
}
} }
default: { default: {
# Do nothing. # Do nothing.

328
manifests/download.pp Normal file
View File

@@ -0,0 +1,328 @@
# Defined Type java::download
#
# @summary
# Installs Java from a url location.
#
#
# @param ensure
# Install or remove the package.
#
# @param version
# Version of Java to install, e.g. '7' or '8'. Default values for major and minor versions will be used.
#
# @param version_major
# Major version which should be installed, e.g. '8u101'. Must be used together with version_minor.
#
# @param version_minor
# Minor version which should be installed, e.g. 'b12'. Must be used together with version_major.
#
# @param java_se
# Type of Java Standard Edition to install, jdk or jre.
#
# @param proxy_server
# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
#
# @param proxy_type
# Proxy server type (none|http|https|ftp). (passed to archive)
#
# @param url
# Full URL
#
# @param jce
# Install Oracles Java Cryptographic Extensions into the JRE or JDK
#
# @param jce_url
# Full URL to the jce zip file
#
# @param basedir
# Directory under which the installation will occur. If not set, defaults to
# /usr/lib/jvm for Debian and /usr/java for RedHat.
#
# @param manage_basedir
# Whether to manage the basedir directory. Defaults to false.
# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
#
# @param package_type
# Type of installation package for specified version of java_se. java_se 6 comes
# in a few installation package flavors and we need to account for them.
# Optional forced package types: rpm, rpmbin, tar.gz
#
# @param manage_symlink
# Whether to manage a symlink that points to the installation directory. Defaults to false.
#
# @param symlink_name
# The name for the optional symlink in the installation directory.
#
define java::download(
$ensure = 'present',
$version = '8',
$version_major = undef,
$version_minor = undef,
$java_se = 'jdk',
$proxy_server = undef,
$proxy_type = undef,
$url = undef,
$jce = false,
$jce_url = undef,
$basedir = undef,
$manage_basedir = false,
$package_type = undef,
$manage_symlink = false,
$symlink_name = undef,
) {
# archive module is used to download the java package
include archive
# validate java Standard Edition to download
if $java_se !~ /(jre|jdk)/ {
fail('Java SE must be either jre or jdk.')
}
if $jce {
if $jce_url {
$jce_download = $jce_url
} else {
fail('JCE URL must be specified')
}
}
# determine Java major and minor version, and installation path
if $version_major and $version_minor {
$label = $version_major
$release_major = $version_major
$release_minor = $version_minor
if $release_major =~ /(\d+)u(\d+)/ {
# Required for CentOS systems where Java8 update number is >= 171 to ensure
# the package is visible to Puppet. This is only true for installations that
# don't use the tar.gz package type.
if $facts['os']['family'] == 'RedHat' and Numeric($2) >= 171 and $package_type != 'tar.gz' {
$install_path = "${java_se}1.${1}.0_${2}-amd64"
} else {
$install_path = "${java_se}1.${1}.0_${2}"
}
} else {
$install_path = "${java_se}${release_major}${release_minor}"
}
} else {
# use default versions if no specific major and minor version parameters are provided
$label = $version
case $version {
'6' : {
$release_major = '6u45'
$release_minor = 'b06'
$install_path = "${java_se}1.6.0_45"
}
'7' : {
$release_major = '7u80'
$release_minor = 'b15'
$install_path = "${java_se}1.7.0_80"
}
'8' : {
$release_major = '8u201'
$release_minor = 'b09'
$install_path = "${java_se}1.8.0_201"
}
default : {
$release_major = '8u201'
$release_minor = 'b09'
$install_path = "${java_se}1.8.0_201"
}
}
}
# determine package type (exe/tar/rpm), destination directory based on OS
case $facts['kernel'] {
'Linux' : {
case $facts['os']['family'] {
'RedHat', 'Amazon' : {
# Oracle Java 6 comes in a special rpmbin format
if $package_type {
$_package_type = $package_type
} elsif $version == '6' {
$_package_type = 'rpmbin'
} else {
$_package_type = 'rpm'
}
if $basedir {
$_basedir = $basedir
} else {
$_basedir = '/usr/java'
}
}
'Debian' : {
if $package_type {
$_package_type = $package_type
} else {
$_package_type = 'tar.gz'
}
if $basedir {
$_basedir = $basedir
} else {
$_basedir = '/usr/lib/jvm'
}
}
default : {
fail ("unsupported platform ${$facts['os']['name']}") }
}
$creates_path = "${_basedir}/${install_path}"
$os = 'linux'
$destination_dir = '/tmp/'
}
default : {
fail ( "unsupported platform ${$facts['kernel']}" ) }
}
# Install required unzip packages for jce
if $jce {
ensure_resource('package', 'unzip', { 'ensure' => 'present' })
}
# set java architecture nomenclature
$os_architecture = $facts['os']['architecture'] ? {
undef => $facts['os']['architecture'],
default => $facts['os']['architecture']
}
case $os_architecture {
'i386' : { $arch = 'i586' }
'x86_64' : { $arch = 'x64' }
'amd64' : { $arch = 'x64' }
default : {
fail ("unsupported platform ${$os_architecture}")
}
}
# following are based on this example:
# http://download.oracle.com/otn-pub/java/jdk/7u80-b15/jre-7u80-linux-i586.rpm
#
# JaveSE 6 distributed in .bin format
# http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586-rpm.bin
# http://download.oracle.com/otn-pub/java/jdk/6u45-b06/jdk-6u45-linux-i586.bin
# package name to use in destination directory for the installer
case $_package_type {
'bin' : {
$package_name = "${java_se}-${release_major}-${os}-${arch}.bin"
}
'rpmbin' : {
$package_name = "${java_se}-${release_major}-${os}-${arch}-rpm.bin"
}
'rpm' : {
$package_name = "${java_se}-${release_major}-${os}-${arch}.rpm"
}
'tar.gz' : {
$package_name = "${java_se}-${release_major}-${os}-${arch}.tar.gz"
}
default : {
$package_name = "${java_se}-${release_major}-${os}-${arch}.rpm"
}
}
# if complete URL is provided, use this value for source in archive resource
if $url {
$source = $url
}
else {
fail('Url must be specified')
}
# full path to the installer
$destination = "${destination_dir}${package_name}"
notice ("Destination is ${destination}")
case $_package_type {
'bin' : {
$install_command = "sh ${destination}"
}
'rpmbin' : {
$install_command = "sh ${destination} -x; rpm --force -iv sun*.rpm; rpm --force -iv ${java_se}*.rpm"
}
'rpm' : {
$install_command = "rpm --force -iv ${destination}"
}
'tar.gz' : {
$install_command = "tar -zxf ${destination} -C ${_basedir}"
}
default : {
$install_command = "rpm -iv ${destination}"
}
}
case $ensure {
'present' : {
archive { $destination :
ensure => present,
source => $source,
extract_path => '/tmp',
cleanup => false,
creates => $creates_path,
proxy_server => $proxy_server,
proxy_type => $proxy_type,
}
case $facts['kernel'] {
'Linux' : {
case $facts['os']['family'] {
'Debian' : {
ensure_resource('file', $_basedir, {
ensure => directory,
})
$install_requires = [Archive[$destination], File[$_basedir]]
}
default : {
$install_requires = [Archive[$destination]]
}
}
if $manage_basedir {
ensure_resource('file', $_basedir, {'ensure' => 'directory', 'before' => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]})
}
exec { "Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}" :
path => '/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin',
command => $install_command,
creates => $creates_path,
require => $install_requires,
}
if ($manage_symlink and $symlink_name) {
file { "${_basedir}/${symlink_name}":
ensure => link,
target => $creates_path,
require => Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"],
}
}
if ($jce and $jce_download != undef) {
$jce_path = $java_se ? {
'jre' => "${creates_path}/lib/security",
'jdk' => "${creates_path}/jre/lib/security"
}
archive { "/tmp/jce-${version}.zip":
source => $jce_download,
extract => true,
extract_path => $jce_path,
extract_flags => '-oj',
creates => "${jce_path}/US_export_policy.jar",
cleanup => false,
proxy_server => $proxy_server,
proxy_type => $proxy_type,
require => [
Package['unzip'],
Exec["Install Oracle java_se ${java_se} ${version} ${release_major} ${release_minor}"]
],
}
}
}
default : {
fail ("unsupported platform ${$facts['kernel']}")
}
}
}
default : {
notice ("Action ${ensure} not supported.")
}
}
}

View File

@@ -1,60 +1,54 @@
# Class: java # @summary
#
# This module manages the Java runtime package # This module manages the Java runtime package
# #
# Parameters: # @param distribution
#
# [*distribution*]
# The java distribution to install. Can be one of "jdk" or "jre", # The java distribution to install. Can be one of "jdk" or "jre",
# or other platform-specific options where there are multiple # or other platform-specific options where there are multiple
# implementations available (eg: OpenJDK vs Oracle JDK). # implementations available (eg: OpenJDK vs Oracle JDK).
# #
# # @param version
# [*version*]
# The version of java to install. By default, this module simply ensures # The version of java to install. By default, this module simply ensures
# that java is present, and does not require a specific version. # that java is present, and does not require a specific version.
# #
# [*package*] # @param package
# The name of the java package. This is configurable in case a non-standard # The name of the java package. This is configurable in case a non-standard
# java package is desired. # java package is desired.
# #
# [*java_alternative*] # @param package_options
# Array of strings to pass installation options to the 'package' Puppet resource.
# Options available depend on the 'package' provider for the target OS.
#
# @param java_alternative
# The name of the java alternative to use on Debian systems. # The name of the java alternative to use on Debian systems.
# "update-java-alternatives -l" will show which choices are available. # "update-java-alternatives -l" will show which choices are available.
# If you specify a particular package, you will almost always also # If you specify a particular package, you will almost always also
# want to specify which java_alternative to choose. If you set # want to specify which java_alternative to choose. If you set
# this, you also need to set the path below. # this, you also need to set the path below.
# #
# [*java_alternative_path*] # @param java_alternative_path
# The path to the "java" command on Debian systems. Since the # The path to the "java" command on Debian systems. Since the
# alternatives system makes it difficult to verify which # alternatives system makes it difficult to verify which
# alternative is actually enabled, this is required to ensure the # alternative is actually enabled, this is required to ensure the
# correct JVM is enabled. # correct JVM is enabled.
# #
# Actions: # @param java_home
# # The path to where the JRE is installed. This will be set as an
# Requires: # environment variable.
#
# Sample Usage:
# #
class java( class java(
$distribution = 'jdk', String $distribution = 'jdk',
$version = 'present', Pattern[/present|installed|latest|^[.+_0-9a-zA-Z:~-]+$/] $version = 'present',
$package = undef, Optional[String] $package = undef,
$java_alternative = undef, Optional[Array] $package_options = undef,
$java_alternative_path = undef Optional[String] $java_alternative = undef,
Optional[String] $java_alternative_path = undef,
Optional[String] $java_home = undef
) { ) {
include java::params include ::java::params
validate_re($version, 'present|installed|latest|^[.+_0-9a-zA-Z:-]+$') $default_package_name = has_key($java::params::java, $distribution) ? {
false => undef,
if has_key($java::params::java, $distribution) { default => $java::params::java[$distribution]['package'],
$default_package_name = $java::params::java[$distribution]['package']
$default_alternative = $java::params::java[$distribution]['alternative']
$default_alternative_path = $java::params::java[$distribution]['alternative_path']
$java_home = $java::params::java[$distribution]['java_home']
} else {
fail("Java distribution ${distribution} is not supported.")
} }
$use_java_package_name = $package ? { $use_java_package_name = $package ? {
@@ -62,12 +56,17 @@ class java(
default => $package, default => $package,
} }
## Weird logic........
## If $java_alternative is set, use that. ## If $java_alternative is set, use that.
## Elsif the DEFAULT package is being used, then use $default_alternative. ## Elsif the DEFAULT package is being used, then use $default_alternative.
## Else undef ## Else undef
$use_java_alternative = $java_alternative ? { $use_java_alternative = $java_alternative ? {
undef => $use_java_package_name ? { undef => $use_java_package_name ? {
$default_package_name => $default_alternative, $default_package_name => has_key($java::params::java, $distribution) ? {
default => $java::params::java[$distribution]['alternative'],
false => undef,
},
default => undef, default => undef,
}, },
default => $java_alternative, default => $java_alternative,
@@ -76,18 +75,43 @@ class java(
## Same logic as $java_alternative above. ## Same logic as $java_alternative above.
$use_java_alternative_path = $java_alternative_path ? { $use_java_alternative_path = $java_alternative_path ? {
undef => $use_java_package_name ? { undef => $use_java_package_name ? {
$default_package_name => $default_alternative_path, $default_package_name => has_key($java::params::java, $distribution) ? {
default => $java::params::java[$distribution]['alternative_path'],
false => undef,
},
default => undef, default => undef,
}, },
default => $java_alternative_path, default => $java_alternative_path,
} }
$use_java_home = $java_home ? {
undef => $use_java_package_name ? {
$default_package_name => has_key($java::params::java, $distribution) ? {
default => $java::params::java[$distribution]['java_home'],
false => undef,
},
default => undef,
},
default => $java_home,
}
## This should only be required if we did not override all the information we need.
# One of the defaults is missing and its not intentional:
if ((
$use_java_package_name == undef or $use_java_alternative == undef or
$use_java_alternative_path == undef or $use_java_home == undef
) and (
! has_key($java::params::java, $distribution)
)) {
fail("Java distribution ${distribution} is not supported. Missing default values.")
}
$jre_flag = $use_java_package_name ? { $jre_flag = $use_java_package_name ? {
/headless/ => '--jre-headless', /headless/ => '--jre-headless',
default => '--jre' default => '--jre'
} }
if $::osfamily == 'Debian' { if $facts['os']['family'] == 'Debian' {
# Needed for update-java-alternatives # Needed for update-java-alternatives
package { 'java-common': package { 'java-common':
ensure => present, ensure => present,
@@ -96,13 +120,12 @@ class java(
} }
anchor { 'java::begin:': } anchor { 'java::begin:': }
-> -> package { 'java':
package { 'java':
ensure => $version, ensure => $version,
install_options => $package_options,
name => $use_java_package_name, name => $use_java_package_name,
} }
-> -> class { 'java::config': }
class { 'java::config': }
-> anchor { 'java::end': } -> anchor { 'java::end': }
} }

View File

@@ -1,172 +1,208 @@
# Class: java::params # @summary
#
# This class builds a hash of JDK/JRE packages and (for Debian) # This class builds a hash of JDK/JRE packages and (for Debian)
# alternatives. For wheezy/precise, we provide Oracle JDK/JRE # alternatives. For wheezy/precise, we provide Oracle JDK/JRE
# options, even though those are not in the package repositories. # options, even though those are not in the package repositories.
# #
# For more info on how to package Oracle JDK/JRE, see the Debian wiki: # @api private
# http://wiki.debian.org/JavaPackage
#
# Because the alternatives system makes it very difficult to tell
# which Java alternative is enabled, we hard code the path to bin/java
# for the config class to test if it is enabled.
class java::params { class java::params {
case $::osfamily { case $facts['os']['family'] {
'RedHat': { 'RedHat': {
case $::operatingsystem { case $facts['os']['name'] {
'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL': { 'AlmaLinux', 'Rocky', 'RedHat', 'CentOS', 'OracleLinux', 'Scientific', 'OEL', 'SLC', 'CloudLinux': {
if (versioncmp($::operatingsystemrelease, '5.0') < 0) { if (versioncmp($facts['os']['release']['full'], '5.0') < 0) {
$jdk_package = 'java-1.6.0-sun-devel' $jdk_package = 'java-1.6.0-sun-devel'
$jre_package = 'java-1.6.0-sun' $jre_package = 'java-1.6.0-sun'
$java_home = '/usr/lib/jvm/java-1.6.0-sun/jre/'
} }
elsif (versioncmp($::operatingsystemrelease, '6.3') < 0) { # See cde7046 for why >= 5.0 < 6.3
elsif (versioncmp($facts['os']['release']['full'], '6.3') < 0) {
$jdk_package = 'java-1.6.0-openjdk-devel' $jdk_package = 'java-1.6.0-openjdk-devel'
$jre_package = 'java-1.6.0-openjdk' $jre_package = 'java-1.6.0-openjdk'
$java_home = '/usr/lib/jvm/java-1.6.0/'
} }
else { # See PR#160 / c8e46b5 for why >= 6.3 < 7.1
$jdk_package = 'java-1.7.0-openjdk-devel' elsif (versioncmp($facts['os']['release']['full'], '7.1') < 0) {
$jre_package = 'java-1.7.0-openjdk'
}
}
'Fedora': {
if (versioncmp($::operatingsystemrelease, '21') < 0) {
$jdk_package = 'java-1.7.0-openjdk-devel' $jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk' $jre_package = 'java-1.7.0-openjdk'
$java_home = '/usr/lib/jvm/java-1.7.0/'
} }
else { else {
$jdk_package = 'java-1.8.0-openjdk-devel' $jdk_package = 'java-1.8.0-openjdk-devel'
$jre_package = 'java-1.8.0-openjdk' $jre_package = 'java-1.8.0-openjdk'
$java_home = '/usr/lib/jvm/java-1.8.0/'
}
}
'Fedora': {
if (versioncmp($facts['os']['release']['full'], '21') < 0) {
$jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk'
$java_home = "/usr/lib/jvm/java-1.7.0-openjdk-${facts['os']['architecture']}/"
}
else {
$jdk_package = 'java-1.8.0-openjdk-devel'
$jre_package = 'java-1.8.0-openjdk'
$java_home = "/usr/lib/jvm/java-1.8.0-openjdk-${facts['os']['architecture']}/"
} }
} }
'Amazon': { 'Amazon': {
$jdk_package = 'java-1.7.0-openjdk-devel' $jdk_package = 'java-1.7.0-openjdk-devel'
$jre_package = 'java-1.7.0-openjdk' $jre_package = 'java-1.7.0-openjdk'
$java_home = "/usr/lib/jvm/java-1.7.0-openjdk-${facts['os']['architecture']}/"
} }
default: { fail("unsupported os ${::operatingsystem}") } default: { fail("unsupported os ${facts['os']['name']}") }
} }
$java = { $java = {
'jdk' => { 'package' => $jdk_package, }, 'jdk' => {
'jre' => { 'package' => $jre_package, }, 'package' => $jdk_package,
'java_home' => $java_home,
},
'jre' => {
'package' => $jre_package,
'java_home' => $java_home,
},
} }
} }
'Debian': { 'Debian': {
case $::lsbdistcodename { $oracle_architecture = $facts['os']['architecture'] ? {
'lenny', 'squeeze', 'lucid', 'natty': { 'amd64' => 'x64',
$java = { default => $facts['os']['architecture']
'jdk' => {
'package' => 'openjdk-6-jdk',
'alternative' => "java-6-openjdk-${::architecture}",
'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
'java_home' => '/usr/lib/jvm/java-6-openjdk/jre/',
},
'jre' => {
'package' => 'openjdk-6-jre-headless',
'alternative' => "java-6-openjdk-${::architecture}",
'alternative_path' => '/usr/lib/jvm/java-6-openjdk/jre/bin/java',
'java_home' => '/usr/lib/jvm/java-6-openjdk/jre/',
},
'sun-jre' => {
'package' => 'sun-java6-jre',
'alternative' => 'java-6-sun',
'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java',
'java_home' => '/usr/lib/jvm/java-6-sun/jre/',
},
'sun-jdk' => {
'package' => 'sun-java6-jdk',
'alternative' => 'java-6-sun',
'alternative_path' => '/usr/lib/jvm/java-6-sun/jre/bin/java',
'java_home' => '/usr/lib/jvm/java-6-sun/jre/',
},
} }
$openjdk_architecture = $facts['os']['architecture'] ? {
'aarch64' => 'arm64',
'armv7l' => 'armhf',
default => $facts['os']['architecture']
} }
'wheezy', 'jessie', 'precise','quantal','raring','saucy', 'trusty', 'utopic': { case $facts['os']['release']['major'] {
$java = { '9': {
'jdk' => {
'package' => 'openjdk-7-jdk',
'alternative' => "java-1.7.0-openjdk-${::architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/",
},
'jre' => {
'package' => 'openjdk-7-jre-headless',
'alternative' => "java-1.7.0-openjdk-${::architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.7.0-openjdk-${::architecture}/",
},
'oracle-jre' => {
'package' => 'oracle-j2re1.7',
'alternative' => 'j2re1.7-oracle',
'alternative_path' => '/usr/lib/jvm/j2re1.7-oracle/bin/java',
'java_home' => '/usr/lib/jvm/j2re1.7-oracle/',
},
'oracle-jdk' => {
'package' => 'oracle-j2sdk1.7',
'alternative' => 'j2sdk1.7-oracle',
'alternative_path' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/bin/java',
'java_home' => '/usr/lib/jvm/j2sdk1.7-oracle/jre/',
},
}
}
'vivid': {
$java = { $java = {
'jdk' => { 'jdk' => {
'package' => 'openjdk-8-jdk', 'package' => 'openjdk-8-jdk',
'alternative' => "java-1.8.0-openjdk-${::architecture}", 'alternative' => "java-1.8.0-openjdk-${openjdk_architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/bin/java", 'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/", 'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/",
}, },
'jre' => { 'jre' => {
'package' => 'openjdk-8-jre-headless', 'package' => 'openjdk-8-jre-headless',
'alternative' => "java-1.8.0-openjdk-${::architecture}", 'alternative' => "java-1.8.0-openjdk-${openjdk_architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/bin/java", 'alternative_path' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${::architecture}/", 'java_home' => "/usr/lib/jvm/java-1.8.0-openjdk-${openjdk_architecture}/",
},
} }
} }
'10', '11', '18.04', '18.10', '19.04', '19.10', '20.04': {
$java = {
'jdk' => {
'package' => 'openjdk-11-jdk',
'alternative' => "java-1.11.0-openjdk-${openjdk_architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/",
},
'jre' => {
'package' => 'openjdk-11-jre-headless',
'alternative' => "java-1.11.0-openjdk-${openjdk_architecture}",
'alternative_path' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/bin/java",
'java_home' => "/usr/lib/jvm/java-1.11.0-openjdk-${openjdk_architecture}/",
},
} }
default: { fail("unsupported release ${::lsbdistcodename}") } }
default: { fail("unsupported release ${facts['os']['release']['major']}") }
} }
} }
'OpenBSD': { 'OpenBSD': {
$java = { $java = {
'jdk' => { 'package' => 'jdk', }, 'jdk' => {
'jre' => { 'package' => 'jre', }, 'package' => 'jdk',
'java_home' => '/usr/local/jdk/',
},
'jre' => {
'package' => 'jre',
'java_home' => '/usr/local/jdk/',
},
}
}
'FreeBSD': {
$java = {
'jdk' => {
'package' => 'openjdk',
'java_home' => '/usr/local/openjdk7/',
},
'jre' => {
'package' => 'openjdk-jre',
'java_home' => '/usr/local/openjdk7/',
},
} }
} }
'Solaris': { 'Solaris': {
$java = { $java = {
'jdk' => { 'package' => 'developer/java/jdk-7', }, 'jdk' => {
'jre' => { 'package' => 'runtime/java/jre-7', }, 'package' => 'developer/java/jdk-7',
'java_home' => '/usr/jdk/instances/jdk1.7.0/',
},
'jre' => {
'package' => 'runtime/java/jre-7',
'java_home' => '/usr/jdk/instances/jdk1.7.0/',
},
} }
} }
'Suse': { 'Suse': {
case $::operatingsystem { case $facts['os']['name'] {
'SLES': { 'SLES': {
case $::operatingsystemmajrelease{ if (versioncmp($facts['os']['release']['full'], '12.1') >= 0) {
default: { $jdk_package = 'java-1_8_0-openjdk-devel'
$jdk_package = 'java-1_6_0-ibm-devel' $jre_package = 'java-1_8_0-openjdk'
$jre_package = 'java-1_6_0-ibm' $java_home = '/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/'
} } elsif (versioncmp($facts['os']['release']['full'], '12') >= 0) {
'12': {
$jdk_package = 'java-1_7_0-openjdk-devel' $jdk_package = 'java-1_7_0-openjdk-devel'
$jre_package = 'java-1_7_0-openjdk' $jre_package = 'java-1_7_0-openjdk'
} $java_home = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'
} elsif (versioncmp($facts['os']['release']['full'], '11.4') >= 0) {
$jdk_package = 'java-1_7_1-ibm-devel'
$jre_package = 'java-1_7_1-ibm'
$java_home = '/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/'
} else {
$jdk_package = 'java-1_6_0-ibm-devel'
$jre_package = 'java-1_6_0-ibm'
$java_home = '/usr/lib64/jvm/java-1.6.0-ibm-1.6.0/'
} }
} }
'OpenSuSE': { 'OpenSuSE': {
$jdk_package = 'java-1_7_0-openjdk-devel' $jdk_package = 'java-1_7_0-openjdk-devel'
$jre_package = 'java-1_7_0-openjdk' $jre_package = 'java-1_7_0-openjdk'
$java_home = '/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/'
} }
default: { default: {
$jdk_package = 'java-1_6_0-ibm-devel' $jdk_package = 'java-1_6_0-ibm-devel'
$jre_package = 'java-1_6_0-ibm' $jre_package = 'java-1_6_0-ibm'
$java_home = '/usr/lib64/jvm/java-1.6.0-ibd-1.6.0/'
} }
} }
$java = { $java = {
'jdk' => { 'package' => $jdk_package, }, 'jdk' => {
'jre' => { 'package' => $jre_package, }, 'package' => $jdk_package,
'java_home' => $java_home,
},
'jre' => {
'package' => $jre_package,
'java_home' => $java_home,
},
} }
} }
default: { fail("unsupported platform ${::osfamily}") } 'Archlinux': {
$jdk_package = 'jdk8-openjdk'
$jre_package = 'jre8-openjdk'
$java_home = '/usr/lib/jvm/java-8-openjdk/jre/'
$java = {
'jdk' => {
'package' => $jdk_package,
'java_home' => $java_home,
},
'jre' => {
'package' => $jre_package,
'java_home' => $java_home,
},
}
}
default: { fail("unsupported platform ${facts['os']['family']}") }
} }
} }

227
manifests/sap.pp Normal file
View File

@@ -0,0 +1,227 @@
# Defined Type java::sap
#
# @summary
# Install one or more versions of SAPJVM or Sapmachine
#
# @param ensure
# Install or remove the package.
#
# @param version
# Version of Java to install, e.g. '8' or '9'. Default values for full versions will be used.
#
# @param version_full
# Major version which should be installed, e.g. '8.1.063' or '11.0.7'. If used, "version" parameter is ignored.
#
# @param java
# Type of Java Edition to install, jdk or jre.
#
# @param proxy_server
# Specify a proxy server, with port number if needed. ie: https://example.com:8080. (passed to archive)
#
# @param proxy_type
# Proxy server type (none|http|https|ftp). (passed to archive)
#
# @param basedir
# Directory under which the installation will occur. If not set, defaults to
# /usr/lib/jvm for Debian and /usr/java for RedHat.
#
# @param manage_basedir
# Whether to manage the basedir directory. Defaults to false.
# Note: /usr/lib/jvm is managed for Debian by default, separate from this parameter.
#
# @param manage_symlink
# Whether to manage a symlink that points to the installation directory. Defaults to false.
#
# @param symlink_name
# The name for the optional symlink in the installation directory.
#
define java::sap (
$ensure = 'present',
$version = '8',
$version_full = undef,
$java = 'jdk',
$proxy_server = undef,
$proxy_type = undef,
$basedir = undef,
$manage_basedir = true,
$manage_symlink = false,
$symlink_name = undef,
) {
# archive module is used to download the java package
include ::archive
# validate java edition to download
if $java !~ /(jre|jdk)/ {
fail('java must be either jre or jdk.')
}
# determine version and installation path
if $version_full {
$_version_array = $version_full.scanf('%i')
$_version_int = $_version_array[0]
$_version_full = $version_full
} else {
$_version = $version
$_version_int = Numeric($_version)
# use default versions if full version parameter is not provided
case $version {
'7' : {
$_version_full = '7.1.072'
if ($java != 'jdk') {
fail('java parameter is not jdk. jre is not supported on version 7')
}
}
'8' : {
$_version_full = '8.1.065'
if ($java != 'jdk') {
fail('java parameter is not jdk. jre is not supported on version 8')
}
}
'11' : {
$_version_full = '11.0.7'
}
'14' : {
$_version_full = '14.0.1'
}
default : {
fail("${version} not yet supported by module")
}
}
}
# extracted folders look like this:
# sapjvm_8
# sapmachine-jdk-11.0.7
if ($_version_int == 7 or $_version_int == 8) {
$_creates_folder = "sapjvm_${_version_int}"
} else {
$_creates_folder = "sapmachine-${java}-${_version_full}"
}
# determine destination directory based on OS
case $facts['kernel'] {
'Linux' : {
case $facts['os']['family'] {
'RedHat', 'Amazon' : {
if $basedir {
$_basedir = $basedir
} else {
$_basedir = '/usr/java'
}
}
'Debian' : {
if $basedir {
$_basedir = $basedir
} else {
$_basedir = '/usr/lib/jvm'
}
}
default : {
fail ("unsupported os family ${$facts['os']['name']}") }
}
$creates_path = "${_basedir}/${_creates_folder}"
}
default : {
fail ( "unsupported platform ${$facts['kernel']}" ) }
}
$_os_architecture = $facts['os']['architecture'] ? {
undef => $facts['architecture'],
default => $facts['os']['architecture']
}
if ($_os_architecture != 'x86_64' and $_os_architecture != 'amd64') {
fail ("unsupported platform ${_os_architecture}")
}
# download links look like this (examples):
# https://tools.hana.ondemand.com/additional/sapjvm-8.1.065-linux-x64.zip
# https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.7/sapmachine-jre-11.0.7_linux-x64_bin.tar.gz
# https://github.com/SAP/SapMachine/releases/download/sapmachine-11.0.7/sapmachine-jdk-11.0.7_linux-x64_bin.tar.gz
# https://github.com/SAP/SapMachine/releases/download/sapmachine-14.0.1/sapmachine-jdk-14.0.1_linux-x64_bin.tar.gz
# cookie is currently at version 3.1, but may be changed one day. It is only required for download at SAP.
# by using this module you agree with the EULA presented at tools.hana.ondemand.com download page!
# Github does not require it
if ( $_version_int == 7 or $_version_int == 8 ) {
# sapjvm download
$archive_filename = "sapjvm-${_version_full}-linux-x64.zip"
$source = "https://tools.hana.ondemand.com/additional/${archive_filename}"
$cookie = 'eula_3_1_agreed=tools.hana.ondemand.com/developer-license-3_1.txt'
if (!defined(Package['unzip'])) {
package { 'unzip':
ensure => 'present',
before => Archive["/tmp/${archive_filename}"],
}
}
} else {
$archive_filename = "sapmachine-${java}-${_version_full}_linux-x64_bin.tar.gz"
$source = "https://github.com/SAP/SapMachine/releases/download/sapmachine-${_version_full}/${archive_filename}"
$cookie = undef
if (!defined(Package['tar'])) {
package { 'tar':
ensure => 'present',
before => Archive["/tmp/${archive_filename}"],
}
}
if (!defined(Package['gzip'])) {
package { 'gzip':
ensure => 'present',
before => Archive["/tmp/${archive_filename}"],
}
}
}
case $ensure {
'present' : {
case $facts['kernel'] {
'Linux' : {
if ($manage_basedir or $facts['os']['family'] == 'Debian'){
if (!defined(File[$_basedir])) {
file { $_basedir:
ensure => 'directory',
before => Archive["/tmp/${archive_filename}"],
}
}
}
archive { "/tmp/${archive_filename}" :
ensure => present,
source => $source,
extract => true,
extract_path => $_basedir,
cleanup => false,
creates => $creates_path,
cookie => $cookie,
proxy_server => $proxy_server,
proxy_type => $proxy_type,
}
if ($manage_symlink and $symlink_name) {
file { "${_basedir}/${symlink_name}":
ensure => link,
target => $creates_path,
require => Archive["/tmp/${archive_filename}"],
}
}
}
default : {
fail ("unsupported platform ${$facts['kernel']}")
}
}
}
default : {
notice ("Action ${ensure} not supported.")
}
}
}

View File

@@ -1,27 +1,36 @@
{ {
"name": "puppetlabs-java", "name": "puppetlabs-java",
"version": "1.4.3", "version": "8.0.0",
"author": "puppetlabs", "author": "puppetlabs",
"summary": "Installs the correct Java package on various platforms.", "summary": "Installs the correct Java package on various platforms.",
"license": "Apache-2.0", "license": "Apache-2.0",
"source": "git://github.com/puppetlabs/puppetlabs-java", "source": "git://github.com/puppetlabs/puppetlabs-java",
"project_page": "https://github.com/puppetlabs/puppetlabs-java", "project_page": "https://github.com/puppetlabs/puppetlabs-java",
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES", "issues_url": "https://tickets.puppet.com/CreateIssueDetails!init.jspa?pid=10707&issuetype=1&team=Modules&customfield_14200=14302&labels=triage&customfield_10005=2147&summary=Issue+found+with+module%3A+puppetlabs-java",
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.13.1 < 9.0.0"
},
{
"name": "puppet/archive",
"version_requirement": ">= 1.1.0 < 7.0.0"
}
],
"operatingsystem_support": [ "operatingsystem_support": [
{ {
"operatingsystem": "RedHat", "operatingsystem": "RedHat",
"operatingsystemrelease": [ "operatingsystemrelease": [
"5",
"6", "6",
"7" "7",
"8"
] ]
}, },
{ {
"operatingsystem": "CentOS", "operatingsystem": "CentOS",
"operatingsystemrelease": [ "operatingsystemrelease": [
"5", "7",
"6", "8"
"7"
] ]
}, },
{ {
@@ -34,58 +43,51 @@
{ {
"operatingsystem": "Scientific", "operatingsystem": "Scientific",
"operatingsystemrelease": [ "operatingsystemrelease": [
"5",
"6" "6"
] ]
}, },
{
"operatingsystem": "Fedora",
"operatingsystemrelease": [
"20",
"21",
"22"
]
},
{ {
"operatingsystem": "Debian", "operatingsystem": "Debian",
"operatingsystemrelease": [ "operatingsystemrelease": [
"6", "9",
"7" "10",
"11"
] ]
}, },
{ {
"operatingsystem": "Ubuntu", "operatingsystem": "Ubuntu",
"operatingsystemrelease": [ "operatingsystemrelease": [
"10.04", "18.04",
"12.04", "20.04"
"14.04"
] ]
}, },
{ {
"operatingsystem": "SLES", "operatingsystem": "SLES",
"operatingsystemrelease": [ "operatingsystemrelease": [
"11 SP1", "12",
"12" "15"
] ]
}, },
{ {
"operatingsystem": "Solaris", "operatingsystem": "Rocky",
"operatingsystemrelease": [ "operatingsystemrelease": [
"11" "8"
]
},
{
"operatingsystem": "AlmaLinux",
"operatingsystemrelease": [
"8"
] ]
} }
], ],
"requirements": [ "requirements": [
{
"name": "pe",
"version_requirement": ">= 3.0.0 < 2015.4.0"
},
{ {
"name": "puppet", "name": "puppet",
"version_requirement": ">= 3.0.0 < 5.0.0" "version_requirement": ">= 6.0.0 < 8.0.0"
} }
], ],
"dependencies": [ "template-url": "https://github.com/puppetlabs/pdk-templates.git#main",
{"name":"puppetlabs/stdlib","version_requirement":">= 2.4.0 < 5.0.0"} "template-ref": "heads/main-0-gf3911d3",
] "pdk-version": "2.3.0"
} }

2
pdk.yaml Normal file
View File

@@ -0,0 +1,2 @@
---
ignore: []

63
provision.yaml Normal file
View File

@@ -0,0 +1,63 @@
---
default:
provisioner: docker
images:
- litmusimage/debian:8
vagrant:
provisioner: vagrant
images:
- centos/7
- generic/ubuntu1804
travis_deb:
provisioner: docker
images:
- litmusimage/debian:9
- litmusimage/debian:10
travis_ub_6:
provisioner: docker
images:
- litmusimage/ubuntu:18.04
- litmusimage/ubuntu:20.04
travis_el7:
provisioner: docker
images:
- litmusimage/centos:7
- litmusimage/oraclelinux:7
- litmusimage/scientificlinux:7
travis_el8:
provisioner: docker
images:
- litmusimage/centos:8
release_checks_6:
provisioner: abs
images:
- redhat-6-x86_64
- redhat-7-x86_64
- redhat-8-x86_64
- centos-6-x86_64
- centos-7-x86_64
- centos-8-x86_64
- oracle-6-x86_64
- oracle-7-x86_64
- scientific-6-x86_64
- scientific-7-x86_64
- debian-9-x86_64
- debian-10-x86_64
- ubuntu-1804-x86_64
- ubuntu-2004-x86_64
- sles-12-x86_64
- sles-15-x86_64
release_checks_7:
provisioner: abs
images:
- redhat-7-x86_64
- redhat-8-x86_64
- centos-7-x86_64
- centos-8-x86_64
- oracle-7-x86_64
- debian-9-x86_64
- debian-10-x86_64
- ubuntu-1804-x86_64
- ubuntu-2004-x86_64
- sles-12-x86_64
- sles-15-x86_64

View File

@@ -1,219 +1,319 @@
# frozen_string_literal: true
require 'spec_helper_acceptance' require 'spec_helper_acceptance'
require 'pry'
#RedHat, CentOS, Scientific, Oracle prior to 5.0 : Sun Java JDK/JRE 1.6 java_class_jre = "class { 'java':\n"\
#RedHat, CentOS, Scientific, Oracle 5.0 < x < 6.3 : OpenJDK Java JDK/JRE 1.6 " distribution => 'jre',\n"\
#RedHat, CentOS, Scientific, Oracle after 6.3 : OpenJDK Java JDK/JRE 1.7 '}'
#Debian 5/6 & Ubuntu 10.04/11.04 : OpenJDK Java JDK/JRE 1.6 or Sun Java JDK/JRE 1.6
#Debian 7/Jesse & Ubuntu 12.04 - 14.04 : OpenJDK Java JDK/JRE 1.7 or Oracle Java JDK/JRE 1.6
#Solaris (what versions?) : Java JDK/JRE 1.7
#OpenSuSE : OpenJDK Java JDK/JRE 1.7
#SLES : IBM Java JDK/JRE 1.6
# C14677 java_class = "class { 'java': }"
# C14678
# C14679 _sources = "file_line { 'non-free source':\n"\
# C14680 " path => '/etc/apt/sources.list',\n"\
# C14681 " match => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main\",\n"\
# C14682 " line => \"deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main non-free\",\n"\
# C14684 '}'
# C14687
# C14692 _sun_jre = "class { 'java':\n"\
# C14696 " distribution => 'sun-jre',\n"\
# C14697 '}'
# C14700 check on solaris 11
# C14701 check on sles 11 _sun_jdk = "class { 'java':\n"\
# C14703 " distribution => 'sun-jdk',\n"\
# C14723 Where is oracle linux 5? '}'
# C14724 Where is oracle linux 5?
# C14771 Where is redhat 7? Centos 7? blank_version = "class { 'java':\n"\
describe "installing java", :unless => UNSUPPORTED_PLATFORMS.include?(fact('osfamily')) do " version => '',\n"\
describe "jre" do '}'
it 'should install jre' do
pp = <<-EOS incorrect_distro = "class { 'java':\n"\
class { 'java': " distribution => 'xyz',\n"\
distribution => 'jre', '}'
blank_distro = "class { 'java':\n"\
" distribution => '',\n"\
'}'
incorrect_package = "class { 'java':\n"\
" package => 'xyz',\n"\
'}'
bogus_alternative = "class { 'java':\n"\
" java_alternative => 'whatever',\n"\
" java_alternative_path => '/whatever',\n"\
'}'
# Oracle installs are disabled by default, because the links to valid oracle installations
# change often. Look the parameters up from the Oracle download URLs at https://java.oracle.com and
# enable the tests:
oracle_enabled = false
oracle_version_major = '8'
oracle_version_minor = '201'
oracle_version_build = '09'
oracle_hash = '42970487e3af4f5aa5bca3f542482c60'
install_oracle_jdk_jre = <<EOL
java::oracle {
'test_oracle_jre':
version => '#{oracle_version_major}',
version_major => '#{oracle_version_major}u#{oracle_version_minor}',
version_minor => 'b#{oracle_version_build}',
url_hash => '#{oracle_hash}',
java_se => 'jre',
} }
EOS java::oracle {
'test_oracle_jdk':
version => '#{oracle_version_major}',
version_major => '#{oracle_version_major}u#{oracle_version_minor}',
version_minor => 'b#{oracle_version_build}',
url_hash => '#{oracle_hash}',
java_se => 'jdk',
}
EOL
# With the version of java that ships with pe on debian wheezy, update-alternatives install_oracle_jre_jce = <<EOL
# throws an error on the first run due to missing alternative for policytool. It still java::oracle {
# updates the alternatives for java 'test_oracle_jre':
if fact('operatingsystem') == 'Debian' and fact('lsbdistcodename') == 'wheezy' version => '#{oracle_version_major}',
apply_manifest(pp) version_major => '#{oracle_version_major}u#{oracle_version_minor}',
version_minor => 'b#{oracle_version_build}',
url_hash => '#{oracle_hash}',
java_se => 'jre',
jce => true,
}
EOL
install_oracle_jdk_jce = <<EOL
java::oracle {
'test_oracle_jdk':
version => '#{oracle_version_major}',
version_major => '#{oracle_version_major}u#{oracle_version_minor}',
version_minor => 'b#{oracle_version_build}',
url_hash => '#{oracle_hash}',
java_se => 'jdk',
jce => true,
}
EOL
# AdoptOpenJDK URLs are quite generic, so tests are enabled by default
# We need to test version 8 and >8 (here we use 9), because namings are different after version 8
adopt_enabled = true unless os[:family].casecmp('SLES').zero?
adopt_version8_major = '8'
adopt_version8_minor = '202'
adopt_version8_build = '08'
adopt_version9_major = '9'
adopt_version9_full = '9.0.4'
adopt_version9_build = '11'
install_adopt_jdk_jre = <<EOL
java::adopt {
'test_adopt_jre_version8':
version => '#{adopt_version8_major}',
version_major => '#{adopt_version8_major}u#{adopt_version8_minor}',
version_minor => 'b#{adopt_version8_build}',
java => 'jre',
}
java::adopt {
'test_adopt_jdk_version8':
version => '#{adopt_version8_major}',
version_major => '#{adopt_version8_major}u#{adopt_version8_minor}',
version_minor => 'b#{adopt_version8_build}',
java => 'jdk',
}
java::adopt {
'test_adopt_jre_version9':
version => '#{adopt_version9_major}',
version_major => '#{adopt_version9_full}',
version_minor => '#{adopt_version9_build}',
java => 'jre',
}
java::adopt {
'test_adopt_jdk_version9':
version => '#{adopt_version9_major}',
version_major => '#{adopt_version9_full}',
version_minor => '#{adopt_version9_build}',
java => 'jdk',
}
EOL
# Adoptium
adoptium_enabled = true unless os[:family].casecmp('SLES').zero?
install_adoptium_jdk = <<EOL
java::adoptium {
'test_adoptium_jdk_version16':
version_major => '16',
version_minor => '0',
version_patch => '2',
version_build => '7',
}
java::adoptium {
'test_adoptium_jdk_version17':
version_major => '17',
version_minor => '0',
version_patch => '1',
version_build => '12',
}
EOL
sap_enabled = true
sap_version7 = '7'
sap_version7_full = '7.1.072'
sap_version8 = '8'
sap_version8_full = '8.1.065'
sap_version11 = '11'
sap_version11_full = '11.0.7'
sap_version14 = '14'
sap_version14_full = '14.0.1'
install_sap_jdk_jre = <<EOL
java::sap {
'test_sap_jdk_version7':
version => '#{sap_version7}',
version_full => '#{sap_version7_full}',
java => 'jdk',
}
java::sap {
'test_sap_jdk_version8':
version => '#{sap_version8}',
version_full => '#{sap_version8_full}',
java => 'jdk',
}
java::sap {
'test_sap_jre_version11':
version => '#{sap_version11}',
version_full => '#{sap_version11_full}',
java => 'jre',
}
java::sap {
'test_sap_jdk_version11':
version => '#{sap_version11}',
version_full => '#{sap_version11_full}',
java => 'jdk',
}
java::sap {
'test_sap_jre_version14':
version => '#{sap_version14}',
version_full => '#{sap_version14_full}',
java => 'jre',
}
java::sap {
'test_sap_jdk_version14':
version => '#{sap_version14}',
version_full => '#{sap_version14_full}',
java => 'jdk',
}
EOL
describe 'installing' do
context 'installing java jre' do
it 'installs jre' do
idempotent_apply(java_class_jre)
end
end
context 'installing java jdk' do
it 'installs jdk' do
idempotent_apply(java_class)
end
end
context 'with failure cases' do
it 'fails to install java with a blank version' do
apply_manifest(blank_version, expect_failures: true)
end
it 'fails to install java with an incorrect distribution' do
apply_manifest(incorrect_distro, expect_failures: true)
end
it 'fails to install java with a blank distribution' do
apply_manifest(blank_distro, expect_failures: true)
end
it 'fails to install java with an incorrect package' do
apply_manifest(incorrect_package, expect_failures: true)
end
it 'fails on debian or RHEL when passed fake java_alternative and path' do
if os[:family] == 'sles'
apply_manifest(bogus_alternative, catch_failures: true)
else else
apply_manifest(pp, :catch_failures => true) apply_manifest(bogus_alternative, expect_failures: true)
end end
apply_manifest(pp, :catch_changes => true)
end end
end end
describe "jdk" do
it 'should install jdk' do
pp = <<-EOS
class { 'java': }
EOS
apply_manifest(pp, :catch_failures => true) context 'java::oracle', if: oracle_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
apply_manifest(pp, :catch_changes => true) let(:install_path) do
end (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
end end
end
# C14686 let(:version_suffix) do
describe 'sun', :if => (fact('operatingsystem') == 'Debian' and fact('operatingsystemrelease').match(/(5|6)/)) do (os[:family] == 'redhat') ? '-amd64' : ''
before :all do end
pp = <<-EOS
file_line { 'non-free source': it 'installs oracle jdk and jre' do
path => '/etc/apt/sources.list', idempotent_apply(install_oracle_jdk_jre)
match => "deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main", jdk_result = shell("test ! -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
line => "deb http://osmirror.delivery.puppetlabs.net/debian/ ${::lsbdistcodename} main non-free", jre_result = shell("test ! -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
} expect(jdk_result.exit_code).to eq(0)
EOS expect(jre_result.exit_code).to eq(0)
apply_manifest(pp) end
shell('apt-get update')
shell('echo "sun-java6-jdk shared/accepted-sun-dlj-v1-1 select true" | debconf-set-selections') it 'installs oracle jdk with jce' do
shell('echo "sun-java6-jre shared/accepted-sun-dlj-v1-1 select true" | debconf-set-selections') idempotent_apply(install_oracle_jdk_jce)
end result = shell("test -e #{install_path}/jdk1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/jre/lib/security/local_policy.jar")
describe 'jre' do expect(result.exit_code).to eq(0)
it 'should install sun-jre' do end
pp = <<-EOS
class { 'java': it 'installs oracle jre with jce' do
distribution => 'sun-jre', idempotent_apply(install_oracle_jre_jce)
} result = shell("test -e #{install_path}/jre1.#{oracle_version_major}.0_#{oracle_version_minor}#{version_suffix}/lib/security/local_policy.jar")
EOS expect(result.exit_code).to eq(0)
end
apply_manifest(pp, :catch_failures => true) end
apply_manifest(pp, :catch_changes => true)
end context 'java::adopt', if: adopt_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
end let(:install_path) do
describe 'jdk' do (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
it 'should install sun-jdk' do end
pp = <<-EOS
class { 'java': let(:version_suffix) do
distribution => 'sun-jdk', (os[:family] == 'redhat') ? '-amd64' : ''
} end
EOS
it 'installs adopt jdk and jre' do
apply_manifest(pp, :catch_failures => true) idempotent_apply(install_adopt_jdk_jre)
apply_manifest(pp, :catch_changes => true) end
end end
end
end context 'java::adoptium', if: adoptium_enabled, unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
let(:install_path) do
# C14704 (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
# C14705 end
# C15006
describe 'oracle', :if => ( let(:version_suffix) do
(fact('operatingsystem') == 'Debian') and (fact('operatingsystemrelease').match(/^7/)) or (os[:family] == 'redhat') ? '-amd64' : ''
(fact('operatingsystem') == 'Ubuntu') and (fact('operatingsystemrelease').match(/^12\.04/)) or end
(fact('operatingsystem') == 'Ubuntu') and (fact('operatingsystemrelease').match(/^14\.04/))
) do it 'installs adopt jdk and jre' do
# not supported idempotent_apply(install_adoptium_jdk)
# The package is not available from any sources, but if a customer end
# custom-builds the package using java-package and adds it to a local end
# repository, that is the intention of this version ability
describe 'jre' do context 'java::sap', if: sap_enabled && ['Sles'].include?(os[:family]), unless: UNSUPPORTED_PLATFORMS.include?(os[:family]) do
it 'should install oracle-jre' do let(:install_path) do
pp = <<-EOS (os[:family] == 'redhat') ? '/usr/java' : '/usr/lib/jvm'
class { 'java': end
distribution => 'oracle-jre',
} it 'installs adopt jdk and jre' do
EOS idempotent_apply(install_sap_jdk_jre)
apply_manifest(pp, :expect_failures => true)
end
end
describe 'jdk' do
it 'should install oracle-jdk' do
pp = <<-EOS
class { 'java':
distribution => 'oracle-jdk',
}
EOS
apply_manifest(pp, :expect_failures => true)
end
end
end
describe 'failure cases' do
# C14711
it 'should fail to install java with an incorrect version' do
pp = <<-EOS
class { 'java':
version => '14.5',
}
EOS
apply_manifest(pp, :expect_failures => true)
end
# C14712
it 'should fail to install java with a blank version' do
pp = <<-EOS
class { 'java':
version => '',
}
EOS
apply_manifest(pp, :expect_failures => true)
end
# C14713
it 'should fail to install java with an incorrect distribution' do
pp = <<-EOS
class { 'java':
distribution => 'xyz',
}
EOS
apply_manifest(pp, :expect_failures => true)
end
# C14714
it 'should fail to install java with a blank distribution' do
pp = <<-EOS
class { 'java':
distribution => '',
}
EOS
apply_manifest(pp, :expect_failures => true)
end
# C14715
it 'should fail to install java with an incorrect package' do
pp = <<-EOS
class { 'java':
package => 'xyz',
}
EOS
apply_manifest(pp, :expect_failures => true)
end
# C14715
it 'should fail to install java with an incorrect package' do
pp = <<-EOS
class { 'java':
package => 'xyz',
}
EOS
apply_manifest(pp, :expect_failures => true)
end
# C14717
# C14719
# C14725
it 'should fail on debian or RHEL when passed fake java_alternative and path' do
pp = <<-EOS
class { 'java':
java_alternative => 'whatever',
java_alternative_path => '/whatever',
}
EOS
if fact('osfamily') == 'Debian' or fact('osfamily') == 'RedHat'
apply_manifest(pp, :expect_failures => true)
else
apply_manifest(pp, :catch_failures => true)
end end
end end
end end

View File

@@ -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/

View File

@@ -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

View File

@@ -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

View File

@@ -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/

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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/

View File

@@ -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/

View File

@@ -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

View File

@@ -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/

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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/

View File

@@ -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/

View File

@@ -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

View File

@@ -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/

View File

@@ -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/

View File

@@ -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/

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -1,210 +1,236 @@
# frozen_string_literal: true
require 'spec_helper' require 'spec_helper'
describe 'java', :type => :class do describe 'java', type: :class do
context 'when select openjdk for CentOS 5.8' do
let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '5.8' }, architecture: 'x86_64' } } }
context 'select openjdk for Centos 5.8' do it { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '5.8'} } it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.6.0/') }
it { should contain_package('java').with_name('java-1.6.0-openjdk-devel') }
end end
context 'select openjdk for Centos 6.3' do context 'when select openjdk for CentOS 6.3' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3'} } let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '6.3' }, architecture: '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') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
end end
context 'select openjdk for Centos 6.2' do context 'when select openjdk for CentOS 7.1.1503' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.2'} } let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '7.1.1503' }, architecture: 'x86_64' } } }
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.8.0-openjdk-devel') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.8.0/') }
end end
context 'select Oracle JRE with alternatives for Centos 6.3' do context 'when select openjdk for CentOS 6.2' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Centos', :operatingsystemrelease => '6.3'} } let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '6.2' }, architecture: 'x86_64' } } }
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 { is_expected.to contain_package('java').with_name('java-1.6.0-openjdk-devel') }
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 { is_expected.not_to contain_exec('update-java-alternatives') }
it { should contain_exec('update-java-alternatives').with_command('alternatives --set java /usr/java/jre1.7.0_67/bin/java') }
end end
context 'select openjdk for Fedora 20' do context 'when select Oracle JRE with alternatives for CentOS 6.3' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} } let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '6.3' }, architecture: 'x86_64' } } }
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') } let(:params) { { 'package' => 'jre', 'java_alternative' => '/usr/bin/java', 'java_alternative_path' => '/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 end
context 'select openjdk for Fedora 21' do context 'when select passed value for CentOS 5.3' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} } let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '5.3' }, architecture: 'x86_64' } } }
it { should contain_package('java').with_name('java-1.8.0-openjdk-devel') } let(:params) { { 'package' => 'jdk', 'java_home' => '/usr/local/lib/jre' } }
it { is_expected.to contain_package('java').with_name('jdk') }
it { is_expected.not_to contain_exec('update-java-alternatives') }
end end
context 'select passed value for Fedora 20' do context 'when select default for CentOS 5.3' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '20'} } let(:facts) { { os: { family: 'RedHat', name: 'CentOS', release: { full: '5.3' }, architecture: '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.6.0-openjdk-devel') }
it { is_expected.not_to contain_exec('update-java-alternatives') }
end end
context 'select passed value for Fedora 21' do context 'when select jdk for Debian Buster (10.0)' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Fedora', :operatingsystemrelease => '21'} } let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'buster' }, release: { major: '10' }, architecture: 'amd64' } } }
let(:params) { { 'distribution' => 'jre' } }
it { should contain_package('java').with_name('java-1.8.0-openjdk') }
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') }
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') }
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') }
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') }
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') }
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') }
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') }
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') }
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') }
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' } } let(:params) { { 'distribution' => 'jdk' } }
it { should contain_package('java').with_name('openjdk-8-jdk') }
it { is_expected.to contain_package('java').with_name('openjdk-11-jdk') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') }
end end
context 'select jre for Ubuntu Vivid (15.04)' do context 'when select jre for Debian Buster (10.0)' do
let(:facts) { {:osfamily => 'Debian', :operatingsystem => 'Ubuntu', :lsbdistcodename => 'vivid', :operatingsystemrelease => '15.04', :architecture => 'amd64',} } let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'buster' }, release: { major: '10' }, architecture: 'amd64' } } }
let(:params) { { 'distribution' => 'jre' } } 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-11-jre-headless') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') }
end end
context 'select openjdk for Amazon Linux' do context 'when select jdk for Ubuntu Bionic (18.04)' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '3.4.43-43.43.amzn1.x86_64'} } let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } }
it { should contain_package('java').with_name('java-1.7.0-openjdk-devel') } let(:params) { { 'distribution' => 'jdk' } }
it { is_expected.to contain_package('java').with_name('openjdk-11-jdk') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') }
end end
context 'select passed value for Amazon Linux' do context 'when select jre for Ubuntu Bionic (18.04)' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Amazon', :operatingsystemrelease => '5.3.4.43-43.43.amzn1.x86_64'} } let(:facts) { { os: { family: 'Debian', name: 'Ubuntu', lsb: { distcodename: 'bionic' }, release: { major: '18.04' }, architecture: 'amd64' } } }
let(:params) { { 'distribution' => 'jre' } } 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('openjdk-11-jre-headless') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64/') }
end end
context 'select openjdk for Oracle Linux' do context 'when select openjdk for Oracle Linux' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.4'} } let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '6.4' }, architecture: '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 end
context 'select openjdk for Oracle Linux 6.2' do context 'when select openjdk for Oracle Linux 6.2' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.2'} } let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '6.2' }, architecture: 'x86_64' } } }
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 end
context 'select passed value for Oracle Linux' do context 'when select passed value for Oracle Linux' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'OracleLinux', :operatingsystemrelease => '6.3'} } let(:facts) { { os: { family: 'RedHat', name: 'OracleLinux', release: { full: '6.3' }, architecture: 'x86_64' } } }
let(:params) { { 'distribution' => 'jre' } } 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 end
context 'select passed value for Scientific Linux' do context 'when select passed value for Scientific Linux' do
let(:facts) { {:osfamily => 'RedHat', :operatingsystem => 'Scientific', :operatingsystemrelease => '6.4'} } let(:facts) { { os: { family: 'RedHat', name: 'Scientific', release: { full: '6.4' }, architecture: 'x86_64' } } }
let(:params) { { 'distribution' => 'jre' } } 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') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
end end
context 'select default for OpenSUSE 12.3' do context 'when select passed value for Scientific Linux CERN (SLC)' do
let(:facts) { {:osfamily => 'Suse', :operatingsystem => 'OpenSUSE', :operatingsystemrelease => '12.3'}} let(:facts) { { os: { family: 'RedHat', name: 'SLC', release: { full: '6.4' }, architecture: 'x86_64' } } }
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') }
end
context 'select jre for OpenBSD' do
let(:facts) { {:osfamily => 'OpenBSD'} }
let(:params) { { 'distribution' => 'jre' } } let(:params) { { 'distribution' => 'jre' } }
it { should contain_package('java').with_name('jre') }
it { is_expected.to contain_package('java').with_name('java-1.7.0-openjdk') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib/jvm/java-1.7.0/') }
end
context 'when select default for OpenSUSE 12.3' do
let(:facts) { { os: { family: 'Suse', name: 'OpenSUSE', release: { major: '12.3' }, architecture: 'x86_64' } } }
it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
end
context 'when select default for SLES 11.3' do
let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '11.3' }, architecture: 'x86_64' } } }
it { is_expected.to contain_package('java').with_name('java-1_6_0-ibm-devel') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.6.0-ibm-1.6.0/') }
end
context 'when select default for SLES 11.4' do
let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '11.4' }, architecture: 'x86_64' } } }
it { is_expected.to contain_package('java').with_name('java-1_7_1-ibm-devel') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.1-ibm-1.7.1/') }
end
context 'when select default for SLES 12.0' do
let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '12.0', major: '12' }, architecture: 'x86_64' } } }
it { is_expected.to contain_package('java').with_name('java-1_7_0-openjdk-devel') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.7.0-openjdk-1.7.0/') }
end
context 'when select default for SLES 12.1' do
let(:facts) { { os: { family: 'Suse', name: 'SLES', release: { full: '12.1', major: '12' }, architecture: 'x86_64' } } }
it { is_expected.to contain_package('java').with_name('java-1_8_0-openjdk-devel') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/usr/lib64/jvm/java-1.8.0-openjdk-1.8.0/') }
end
describe 'custom java package' do
let(:facts) { { os: { family: 'Debian', name: 'Debian', lsb: { distcodename: 'bullseye' }, release: { major: '11' }, architecture: 'amd64' } } }
context 'when all params provided' do
let(:params) do
{
'distribution' => 'custom',
'package' => 'custom_jdk',
'java_alternative' => 'java-custom_jdk',
'java_alternative_path' => '/opt/custom_jdk/bin/java',
'java_home' => '/opt/custom_jdk',
}
end
it { is_expected.to contain_package('java').with_name('custom_jdk') }
it { is_expected.to contain_file_line('java-home-environment').with_line('JAVA_HOME=/opt/custom_jdk') }
it { is_expected.to contain_exec('update-java-alternatives').with_command('update-java-alternatives --set java-custom_jdk --jre') }
end
context 'with missing parameters' do
let(:params) do
{
'distribution' => 'custom',
'package' => 'custom_jdk',
}
end
it do
expect { catalogue }.to raise_error Puppet::Error, %r{is not supported. Missing default values}
end
end
end end
describe 'incompatible OSs' do describe 'incompatible OSs' do
[ [
{ {
# C14706 os: {
:osfamily => 'windows', family: 'windows',
:operatingsystem => 'windows', name: 'windows',
:operatingsystemrelease => '8.1', release: { full: '8.1' },
},
}, },
{ {
# C14707 os: {
:osfamily => 'Darwin', family: 'Darwin',
:operatingsystem => 'Darwin', name: 'Darwin',
:operatingsystemrelease => '13.3.0', release: { full: '13.3.0' },
},
}, },
{ {
# C14708 os: {
:osfamily => 'AIX', family: 'AIX',
:operatingsystem => 'AIX', name: 'AIX',
:operatingsystemrelease => '7100-02-00-000', release: { full: '7100-02-00-000' },
},
}, },
{ {
# C14708 os: {
:osfamily => 'AIX', family: 'AIX',
:operatingsystem => 'AIX', name: 'AIX',
:operatingsystemrelease => '6100-07-04-1216', release: { full: '6100-07-04-1216' },
},
}, },
{ {
# C14708 os: {
:osfamily => 'AIX', family: 'AIX',
:operatingsystem => 'AIX', name: 'AIX',
:operatingsystemrelease => '5300-12-01-1016', release: { full: '5300-12-01-1016' },
},
}, },
].each do |facts| ].each do |facts|
let(:facts) { facts } let(:facts) { facts }
it "should fail on #{facts[:operatingsystem]} #{facts[:operatingsystemrelease]}" do
expect { catalogue }.to raise_error Puppet::Error, /unsupported platform/ it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform}
end end
end end
end end

8
spec/default_facts.yml Normal file
View File

@@ -0,0 +1,8 @@
# Use default_module_facts.yml for module specific facts.
#
# Facts specified here will override the values provided by rspec-puppet-facts.
---
ipaddress: "172.16.254.254"
ipaddress6: "FE80:0000:0000:0000:AAAA:AAAA:AAAA"
is_pe: false
macaddress: "AA:AA:AA:AA:AA:AA"

360
spec/defines/adopt_spec.rb Normal file
View File

@@ -0,0 +1,360 @@
# frozen_string_literal: true
require 'spec_helper'
describe 'java::adopt', type: :define do
context 'with CentOS 64-bit' do
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
context 'when manage_symlink is set to true' do
let(:params) do
{
ensure: 'present',
version: '11',
java: 'jdk',
basedir: '/usr/java',
manage_symlink: true,
symlink_name: 'java_home',
}
end
let(:title) { 'jdk11_symlink' }
it { is_expected.to contain_file('/usr/java/java_home') }
end
context 'when manage_symlink is not set' do
let(:params) { { ensure: 'present', version: '11', java: 'jdk' } }
let(:title) { 'jdk11_nosymlink' }
it { is_expected.not_to contain_file('/usr/java/java_home') }
end
context 'when AdoptOpenJDK Java 8 JDK' do
let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz]') }
end
context 'when AdoptOpenJDK Java 9 JDK' do
let(:params) { { ensure: 'present', version: '9', java: 'jdk' } }
let(:title) { 'jdk9' }
it { is_expected.to contain_archive('/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').with_command('tar -zxf /tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz]') }
end
context 'when AdoptOpenJDK Java 10 JDK' do
let(:params) { { ensure: 'present', version: '10', java: 'jdk' } }
let(:title) { 'jdk10' }
it { is_expected.to contain_archive('/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').with_command('tar -zxf /tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz]') }
end
context 'when AdoptOpenJDK Java 11 JDK' do
let(:params) { { ensure: 'present', version: '11', java: 'jdk' } }
let(:title) { 'jdk11' }
it { is_expected.to contain_archive('/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').with_command('tar -zxf /tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz]') }
end
context 'when AdoptOpenJDK Java 12 JDK' do
let(:params) { { ensure: 'present', version: '12', java: 'jdk' } }
let(:title) { 'jdk12' }
it { is_expected.to contain_archive('/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').with_command('tar -zxf /tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz]') }
end
context 'when AdoptOpenJDK Java 8 JRE' do
let(:params) { { ensure: 'present', version: '8', java: 'jre' } }
let(:title) { 'jre8' }
it { is_expected.to contain_archive('/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz]') }
end
context 'when AdoptOpenJDK Java 9 JRE' do
let(:params) { { ensure: 'present', version: '9', java: 'jre' } }
let(:title) { 'jre9' }
it { is_expected.to contain_archive('/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').with_command('tar -zxf /tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz]') }
end
context 'when AdoptOpenJDK Java 10 JRE' do
let(:params) { { ensure: 'present', version: '10', java: 'jre' } }
let(:title) { 'jre11' }
it { is_expected.to contain_archive('/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').with_command('tar -zxf /tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz]') }
end
context 'when AdoptOpenJDK Java 11 JRE' do
let(:params) { { ensure: 'present', version: '11', java: 'jre' } }
let(:title) { 'jre11' }
it { is_expected.to contain_archive('/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').with_command('tar -zxf /tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz]') }
end
context 'when AdoptOpenJDK Java 12 JRE' do
let(:params) { { ensure: 'present', version: '12', java: 'jre' } }
let(:title) { 'jre12' }
it { is_expected.to contain_archive('/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').with_command('tar -zxf /tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz]') }
end
context 'when installing multiple versions' do
let(:params) do
{
ensure: 'present',
version_major: '8u202',
version_minor: 'b08',
java: 'jdk',
}
end
let(:title) { 'jdk8' }
let(:pre_condition) do
<<-EOL
java::adopt {
'jdk8172':
ensure => 'present',
version_major => '8u172',
version_minor => 'b11',
java => 'jdk',
}
EOL
end
it { is_expected.to compile }
end
context 'when specifying package_type tar.gz and basedir' do
let(:params) do
{
ensure: 'present',
version: '8',
java: 'jdk',
basedir: '/usr/java',
package_type: 'tar.gz',
}
end
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz]') }
end
context 'when manage_basedir is set to true' do
let(:params) do
{
ensure: 'present',
version: '8',
java: 'jdk',
basedir: '/usr/java',
manage_basedir: true,
}
end
let(:title) { 'jdk8' }
it { is_expected.to contain_file('/usr/java') }
end
end
context 'with Ubuntu 64-bit' do
let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }
context 'when AdoptOpenJDK Java 8 JDK' do
let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jdk_x64_linux_hotspot_8u202b08.tar.gz]') }
end
context 'when AdoptOpenJDK Java 9 JDK' do
let(:params) { { ensure: 'present', version: '9', java: 'jdk' } }
let(:title) { 'jdk9' }
it { is_expected.to contain_archive('/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').with_command('tar -zxf /tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jdk_x64_linux_hotspot_9.0.4_11.tar.gz]') }
end
context 'when AdoptOpenJDK Java 10 JDK' do
let(:params) { { ensure: 'present', version: '10', java: 'jdk' } }
let(:title) { 'jdk10' }
it { is_expected.to contain_archive('/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').with_command('tar -zxf /tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jdk_x64_linux_hotspot_10.0.2_13.tar.gz]') }
end
context 'when AdoptOpenJDK Java 11 JDK' do
let(:params) { { ensure: 'present', version: '11', java: 'jdk' } }
let(:title) { 'jdk11' }
it { is_expected.to contain_archive('/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').with_command('tar -zxf /tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jdk_x64_linux_hotspot_11.0.2_9.tar.gz]') }
end
context 'when AdoptOpenJDK Java 12 JDK' do
let(:params) { { ensure: 'present', version: '12', java: 'jdk' } }
let(:title) { 'jdk12' }
it { is_expected.to contain_archive('/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').with_command('tar -zxf /tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jdk 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jdk_x64_linux_hotspot_12.0.1_12.tar.gz]') }
end
context 'when AdoptOpenJDK Java 8 JRE' do
let(:params) { { ensure: 'present', version: '8', java: 'jre' } }
let(:title) { 'jre8' }
it { is_expected.to contain_archive('/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').with_command('tar -zxf /tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 8 8u202 b08').that_requires('Archive[/tmp/OpenJDK8U-jre_x64_linux_hotspot_8u202b08.tar.gz]') }
end
context 'when AdoptOpenJDK Java 9 JRE' do
let(:params) { { ensure: 'present', version: '9', java: 'jre' } }
let(:title) { 'jre9' }
it { is_expected.to contain_archive('/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').with_command('tar -zxf /tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 9 9.0.4 11').that_requires('Archive[/tmp/OpenJDK9U-jre_x64_linux_hotspot_9.0.4_11.tar.gz]') }
end
context 'when AdoptOpenJDK Java 10 JRE' do
let(:params) { { ensure: 'present', version: '10', java: 'jre' } }
let(:title) { 'jre11' }
it { is_expected.to contain_archive('/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').with_command('tar -zxf /tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 10 10.0.2 13').that_requires('Archive[/tmp/OpenJDK10U-jre_x64_linux_hotspot_10.0.2_13.tar.gz]') }
end
context 'when AdoptOpenJDK Java 11 JRE' do
let(:params) { { ensure: 'present', version: '11', java: 'jre' } }
let(:title) { 'jre11' }
it { is_expected.to contain_archive('/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').with_command('tar -zxf /tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 11 11.0.2 9').that_requires('Archive[/tmp/OpenJDK11U-jre_x64_linux_hotspot_11.0.2_9.tar.gz]') }
end
context 'when AdoptOpenJDK Java 12 JRE' do
let(:params) { { ensure: 'present', version: '12', java: 'jre' } }
let(:title) { 'jre12' }
it { is_expected.to contain_archive('/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').with_command('tar -zxf /tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install AdoptOpenJDK java jre 12 12.0.1 12').that_requires('Archive[/tmp/OpenJDK12U-jre_x64_linux_hotspot_12.0.1_12.tar.gz]') }
end
context 'when installing multiple versions' do
let(:params) do
{
ensure: 'present',
version_major: '8u202',
version_minor: 'b08',
java: 'jdk',
}
end
let(:title) { 'jdk8' }
let(:pre_condition) do
<<-EOL
java::adopt {
'jdk8172':
ensure => 'present',
version_major => '8u172',
version_minor => 'b11',
java => 'jdk',
}
EOL
end
it { is_expected.to compile }
end
end
describe 'incompatible OSes' do
[
{
kernel: 'Windows',
os: {
family: 'Windows',
name: 'Windows',
release: {
full: '8.1',
},
},
},
{
kernel: 'Darwin',
os: {
family: 'Darwin',
name: 'Darwin',
release: {
full: '13.3.0',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '7100-02-00-000',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '6100-07-04-1216',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '5300-12-01-1016',
},
},
},
].each do |facts|
let(:facts) { facts }
let(:title) { 'jdk' }
it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform}
end
end
end
end

View File

@@ -0,0 +1,308 @@
# frozen_string_literal: true
require 'spec_helper'
describe 'java::adoptium', type: :define do
context 'with CentOS 64-bit' do
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
context 'when manage_symlink is set to true' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
basedir: '/usr/java',
manage_symlink: true,
symlink_name: 'java_home',
}
end
let(:title) { 'jdk16_symlink' }
it { is_expected.to contain_file('/usr/java/java_home') }
end
context 'when manage_symlink is not set' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
basedir: '/usr/java',
symlink_name: 'java_home',
}
end
let(:title) { 'jdk16_nosymlink' }
it { is_expected.not_to contain_file('/usr/java/java_home') }
end
context 'when Adoptium Temurin Java 16 JDK' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
basedir: '/usr/java',
symlink_name: 'java_home',
}
end
let(:title) { 'jdk16' }
it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command('tar -zxf /tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') }
end
context 'when Adoptium Temurin Java 17 JDK' do
let(:params) do
{
ensure: 'present',
version_major: '17',
version_minor: '0',
version_patch: '1',
version_build: '12',
basedir: '/usr/java',
symlink_name: 'java_home',
}
end
let(:title) { 'jdk17' }
it { is_expected.to contain_archive('/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').with_command('tar -zxf /tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').that_requires('Archive[/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz]') }
end
context 'when installing multiple versions' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
}
end
let(:title) { 'jdk16' }
let(:pre_condition) do
<<-EOL
java::adoptium {
'jdk17':
ensure => 'present',
version_major => '17',
version_minor => '0',
version_patch => '1',
version_build => '12',
}
EOL
end
it { is_expected.to compile }
end
context 'when specifying package_type tar.gz and basedir' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
basedir: '/usr/java',
}
end
let(:title) { 'jdk16' }
it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command('tar -zxf /tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -C /usr/java') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') }
end
context 'when manage_basedir is set to true' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
basedir: '/usr/java',
manage_basedir: true,
}
end
let(:title) { 'jdk16' }
it { is_expected.to contain_file('/usr/java') }
end
end
context 'with Ubuntu 64-bit' do
let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }
context 'when Adoptium Temurin Java 16 JDK' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
symlink_name: 'java_home',
}
end
let(:title) { 'jdk16' }
it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command('tar -zxf /tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') }
end
context 'when Adoptium Temurin Java 17 JDK' do
let(:params) do
{
ensure: 'present',
version_major: '17',
version_minor: '0',
version_patch: '1',
version_build: '12',
symlink_name: 'java_home',
}
end
let(:title) { 'jdk17' }
it { is_expected.to contain_archive('/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').with_command('tar -zxf /tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 17 0 1 12').that_requires('Archive[/tmp/OpenJDK17U-jdk_x64_linux_hotspot_17.0.1_12.tar.gz]') }
end
context 'when installing multiple versions' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
}
end
let(:title) { 'jdk16' }
let(:pre_condition) do
<<-EOL
java::adoptium {
'jdk17':
ensure => 'present',
version_major => '17',
version_minor => '0',
version_patch => '1',
version_build => '12',
}
EOL
end
it { is_expected.to compile }
end
context 'when specifying package_type tar.gz and basedir' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
basedir: '/usr/lib/jvm',
}
end
let(:title) { 'jdk16' }
it { is_expected.to contain_archive('/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').with_command('tar -zxf /tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz -C /usr/lib/jvm') }
it { is_expected.to contain_exec('Install Adoptium Temurin java 16 0 2 7').that_requires('Archive[/tmp/OpenJDK16U-jdk_x64_linux_hotspot_16.0.2_7.tar.gz]') }
end
context 'when manage_basedir is set to true' do
let(:params) do
{
ensure: 'present',
version_major: '16',
version_minor: '0',
version_patch: '2',
version_build: '7',
basedir: '/usr/lib/jvm',
manage_basedir: true,
}
end
let(:title) { 'jdk16' }
it { is_expected.to contain_file('/usr/lib/jvm') }
end
end
describe 'incompatible OSes' do
[
{
kernel: 'Windows',
os: {
family: 'Windows',
name: 'Windows',
release: {
full: '8.1',
},
},
},
{
kernel: 'Darwin',
os: {
family: 'Darwin',
name: 'Darwin',
release: {
full: '13.3.0',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '7100-02-00-000',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '6100-07-04-1216',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '5300-12-01-1016',
},
},
},
].each do |facts|
let(:facts) { facts }
let(:title) { 'jdk' }
it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform}
end
end
end
end

View File

@@ -0,0 +1,160 @@
# frozen_string_literal: true
require 'spec_helper'
describe 'java::download', type: :define do
let(:url) { 'http://download.oracle.com/otn-pub/java/jdk/8u201-b09/42970487e3af4f5aa5bca3f542482c60/jdk-8u201-linux-x64.tar.gz' }
context 'with CentOS 64-bit' do
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
context 'when passing URL to url parameter' do
let(:params) do
{
ensure: 'present',
version_major: '8u201',
version_minor: 'b09',
java_se: 'jdk',
url: url,
}
end
let(:title) { 'jdk8' }
it {
is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.rpm')
}
end
context 'when no url provided' do
let(:params) do
{
ensure: 'present',
version_major: '8u201',
version_minor: 'b09',
java_se: 'jdk',
}
end
let(:title) { 'jdk8' }
it {
is_expected.to raise_error Puppet::Error
}
end
context 'when manage_symlink is set to true' do
let(:params) do
{
ensure: 'present',
version: '6',
java_se: 'jdk',
basedir: '/usr/java',
manage_symlink: true,
symlink_name: 'java_home',
url: url,
}
end
let(:title) { 'jdk6' }
it { is_expected.to contain_file('/usr/java/java_home') }
end
context 'when manage_symlink is not set' do
let(:params) do
{
ensure: 'present',
version: '6',
java_se: 'jdk',
basedir: '/usr/java',
url: url,
}
end
let(:title) { 'jdk6_nosymlink' }
it { is_expected.not_to contain_file('/usr/java/java_home') }
end
end
context 'with Ubuntu 64-bit' do
let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }
context 'when passing URL to url parameter' do
let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
end
end
context 'with Debian 64-bit' do
let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Debian', release: { full: '10.0' } } } }
context 'when passing URL to url parameter' do
let(:params) { { ensure: 'present', version_major: '8u201', version_minor: 'b09', java_se: 'jdk', url: url } }
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/jdk-8u201-linux-x64.tar.gz') }
end
end
describe 'incompatible OSes' do
[
{
kernel: 'Windows',
os: {
family: 'Windows',
name: 'Windows',
release: {
full: '8.1',
},
},
},
{
kernel: 'Darwin',
os: {
family: 'Darwin',
name: 'Darwin',
release: {
full: '13.3.0',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '7100-02-00-000',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '6100-07-04-1216',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '5300-12-01-1016',
},
},
},
].each do |facts|
let(:facts) { facts }
let(:title) { 'jdk' }
it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform}
end
end
end
end

257
spec/defines/sap_spec.rb Normal file
View File

@@ -0,0 +1,257 @@
# frozen_string_literal: true
require 'spec_helper'
describe 'java::sap', type: :define do
context 'with CentOS 64-bit' do
let(:facts) { { kernel: 'Linux', os: { family: 'RedHat', architecture: 'x86_64', name: 'CentOS', release: { full: '6.0' } } } }
context 'when manage_symlink is set to true' do
let(:params) do
{
ensure: 'present',
version: '11',
java: 'jdk',
basedir: '/usr/java',
manage_symlink: true,
symlink_name: 'java_home',
}
end
let(:title) { 'jdk11_symlink' }
it { is_expected.to contain_file('/usr/java/java_home') }
end
context 'when manage_symlink is not set' do
let(:params) { { ensure: 'present', version: '11', java: 'jdk' } }
let(:title) { 'jdk11_nosymlink' }
it { is_expected.not_to contain_file('/usr/java/java_home') }
end
context 'when sapjvm 7' do
let(:params) { { ensure: 'present', version: '7', java: 'jdk' } }
let(:title) { 'jdk7' }
it { is_expected.to contain_archive('/tmp/sapjvm-7.1.072-linux-x64.zip') }
end
context 'when sapjvm 8' do
let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/sapjvm-8.1.065-linux-x64.zip') }
end
context 'when sapmachine 11 jdk' do
let(:params) { { ensure: 'present', version: '11', java: 'jdk' } }
let(:title) { 'jdk11' }
it { is_expected.to contain_archive('/tmp/sapmachine-jdk-11.0.7_linux-x64_bin.tar.gz') }
end
context 'when sapmachine 11 jre' do
let(:params) { { ensure: 'present', version: '11', java: 'jre' } }
let(:title) { 'jre11' }
it { is_expected.to contain_archive('/tmp/sapmachine-jre-11.0.7_linux-x64_bin.tar.gz') }
end
context 'when sapmachine 14 jdk' do
let(:params) { { ensure: 'present', version: '14', java: 'jdk' } }
let(:title) { 'jdk14' }
it { is_expected.to contain_archive('/tmp/sapmachine-jdk-14.0.1_linux-x64_bin.tar.gz') }
end
context 'when sapmachine 14 jre' do
let(:params) { { ensure: 'present', version: '14', java: 'jre' } }
let(:title) { 'jre14' }
it { is_expected.to contain_archive('/tmp/sapmachine-jre-14.0.1_linux-x64_bin.tar.gz') }
end
context 'when installing multiple versions' do
let(:params) do
{
ensure: 'present',
version_full: '11.0.7',
java: 'jdk',
}
end
let(:title) { 'jdk1107' }
let(:pre_condition) do
<<-EOL
java::sap {
'jdk1106':
ensure => 'present',
version_full => '11.0.6',
java => 'jdk',
}
EOL
end
it { is_expected.to compile }
end
context 'when specifying basedir' do
let(:params) do
{
ensure: 'present',
version: '8',
java: 'jdk',
basedir: '/usr/java',
}
end
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/sapjvm-8.1.065-linux-x64.zip') }
end
context 'when manage_basedir is set to true' do
let(:params) do
{
ensure: 'present',
version: '8',
java: 'jdk',
basedir: '/usr/java',
manage_basedir: true,
}
end
let(:title) { 'jdk8' }
it { is_expected.to contain_file('/usr/java') }
end
end
context 'with Ubuntu 64-bit' do
let(:facts) { { kernel: 'Linux', os: { family: 'Debian', architecture: 'amd64', name: 'Ubuntu', release: { full: '18.04' } } } }
context 'when sapjvm 7' do
let(:params) { { ensure: 'present', version: '7', java: 'jdk' } }
let(:title) { 'jdk7' }
it { is_expected.to contain_archive('/tmp/sapjvm-7.1.072-linux-x64.zip') }
end
context 'when sapjvm 8' do
let(:params) { { ensure: 'present', version: '8', java: 'jdk' } }
let(:title) { 'jdk8' }
it { is_expected.to contain_archive('/tmp/sapjvm-8.1.065-linux-x64.zip') }
end
context 'when sapmachine 11 jdk' do
let(:params) { { ensure: 'present', version: '11', java: 'jdk' } }
let(:title) { 'jdk11' }
it { is_expected.to contain_archive('/tmp/sapmachine-jdk-11.0.7_linux-x64_bin.tar.gz') }
end
context 'when sapmachine 11 jre' do
let(:params) { { ensure: 'present', version: '11', java: 'jre' } }
let(:title) { 'jre11' }
it { is_expected.to contain_archive('/tmp/sapmachine-jre-11.0.7_linux-x64_bin.tar.gz') }
end
context 'when sapmachine 14 jdk' do
let(:params) { { ensure: 'present', version: '14', java: 'jdk' } }
let(:title) { 'jdk14' }
it { is_expected.to contain_archive('/tmp/sapmachine-jdk-14.0.1_linux-x64_bin.tar.gz') }
end
context 'when sapmachine 14 jre' do
let(:params) { { ensure: 'present', version: '14', java: 'jre' } }
let(:title) { 'jre14' }
it { is_expected.to contain_archive('/tmp/sapmachine-jre-14.0.1_linux-x64_bin.tar.gz') }
end
context 'when installing multiple versions' do
let(:params) do
{
ensure: 'present',
version_full: '11.0.7',
java: 'jdk',
}
end
let(:title) { 'jdk1107' }
let(:pre_condition) do
<<-EOL
java::sap {
'jdk1106':
ensure => 'present',
version_full => '11.0.6',
java => 'jdk',
}
EOL
end
it { is_expected.to compile }
end
end
describe 'incompatible OSes' do
[
{
kernel: 'Windows',
os: {
family: 'Windows',
name: 'Windows',
release: {
full: '8.1',
},
},
},
{
kernel: 'Darwin',
os: {
family: 'Darwin',
name: 'Darwin',
release: {
full: '13.3.0',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '7100-02-00-000',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '6100-07-04-1216',
},
},
},
{
kernel: 'AIX',
os: {
family: 'AIX',
name: 'AIX',
release: {
full: '5300-12-01-1016',
},
},
},
].each do |facts|
let(:facts) { facts }
let(:title) { 'jdk' }
it "is_expected.to fail on #{facts[:os][:name]} #{facts[:os][:release][:full]}" do
expect { catalogue }.to raise_error Puppet::Error, %r{unsupported platform}
end
end
end
end

View File

@@ -1,6 +0,0 @@
--format
s
--colour
--loadby
mtime
--backtrace

View File

@@ -1,6 +1,74 @@
require 'puppetlabs_spec_helper/module_spec_helper' # frozen_string_literal: true
RSpec.configure do |c| RSpec.configure do |c|
# declare an exclusion filter for the tests using with_env on facter 1.6, as the function is not available on 1.6 c.mock_with :rspec
c.filter_run_excluding :with_env => true if Facter.version =~ /^1\.6\./
end end
require 'puppetlabs_spec_helper/module_spec_helper'
require 'rspec-puppet-facts'
require 'spec_helper_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_local.rb'))
include RspecPuppetFacts
default_facts = {
puppetversion: Puppet.version,
facterversion: Facter.version,
}
default_fact_files = [
File.expand_path(File.join(File.dirname(__FILE__), 'default_facts.yml')),
File.expand_path(File.join(File.dirname(__FILE__), 'default_module_facts.yml')),
]
default_fact_files.each do |f|
next unless File.exist?(f) && File.readable?(f) && File.size?(f)
begin
default_facts.merge!(YAML.safe_load(File.read(f), [], [], true))
rescue => e
RSpec.configuration.reporter.message "WARNING: Unable to load #{f}: #{e}"
end
end
# read default_facts and merge them over what is provided by facterdb
default_facts.each do |fact, value|
add_custom_fact fact, value
end
RSpec.configure do |c|
c.default_facts = default_facts
c.before :each do
# set to strictest setting for testing
# by default Puppet runs at warning level
Puppet.settings[:strict] = :warning
Puppet.settings[:strict_variables] = true
end
c.filter_run_excluding(bolt: true) unless ENV['GEM_BOLT']
c.after(:suite) do
RSpec::Puppet::Coverage.report!(0)
end
# Filter backtrace noise
backtrace_exclusion_patterns = [
%r{spec_helper},
%r{gems},
]
if c.respond_to?(:backtrace_exclusion_patterns)
c.backtrace_exclusion_patterns = backtrace_exclusion_patterns
elsif c.respond_to?(:backtrace_clean_patterns)
c.backtrace_clean_patterns = backtrace_exclusion_patterns
end
end
# Ensures that a module is defined
# @param module_name Name of the module
def ensure_module_defined(module_name)
module_name.split('::').reduce(Object) do |last_module, next_module|
last_module.const_set(next_module, Module.new) unless last_module.const_defined?(next_module, false)
last_module.const_get(next_module, false)
end
end
# 'spec_overrides' from sync.yml will appear below this line

View File

@@ -1,43 +1,6 @@
require 'beaker-rspec' # frozen_string_literal: true
require 'beaker/puppet_install_helper'
run_puppet_install_helper require 'puppet_litmus'
require 'spec_helper_acceptance_local' if File.file?(File.join(File.dirname(__FILE__), 'spec_helper_acceptance_local.rb'))
UNSUPPORTED_PLATFORMS = [ "Darwin", "windows" ] PuppetLitmus.configure!
unless ENV["RS_PROVISION"] == "no" or ENV["BEAKER_provision"] == "no"
hosts.each do |host|
if host['platform'] =~ /sles-1/i || host['platform'] =~ /solaris-1/i
get_stdlib = <<-stdlib
package{'wget':}
exec{'download':
command => "wget -P /root/ https://forgeapi.puppetlabs.com/v3/files/puppetlabs-stdlib-4.3.2.tar.gz --no-check-certificate",
path => ['/opt/csw/bin/','/usr/bin/']
}
stdlib
apply_manifest_on(host, get_stdlib)
# have to use force otherwise it checks ssl cert even though it is a local file
on host, puppet('module install /root/puppetlabs-stdlib-4.3.2.tar.gz --force')
else
on host, puppet("module install puppetlabs-stdlib")
# For test support
on host, puppet("module install puppetlabs-apt")
end
end
end
RSpec.configure do |c|
# Project root
proj_root = File.expand_path(File.join(File.dirname(__FILE__), ".."))
# Readable test descriptions
c.formatter = :documentation
# Configure all nodes in nodeset
c.before :suite do
# Install module
hosts.each do |host|
copy_module_to(host, :source => proj_root, :module_name => "java")
end
end
end

View File

@@ -0,0 +1,3 @@
# frozen_string_literal: true
UNSUPPORTED_PLATFORMS = ['darwin', 'windows'].freeze

30
spec/spec_helper_local.rb Normal file
View File

@@ -0,0 +1,30 @@
# frozen_string_literal: true
if ENV['COVERAGE'] == 'yes'
require 'simplecov'
require 'simplecov-console'
require 'codecov'
SimpleCov.formatters = [
SimpleCov::Formatter::HTMLFormatter,
SimpleCov::Formatter::Console,
SimpleCov::Formatter::Codecov,
]
SimpleCov.start do
track_files 'lib/**/*.rb'
add_filter '/spec'
# do not track vendored files
add_filter '/vendor'
add_filter '/.vendor'
# do not track gitignored files
# this adds about 4 seconds to the coverage check
# this could definitely be optimized
add_filter do |f|
# system returns true if exit status is 0, which with git-check-ignore means file is ignored
system("git check-ignore --quiet #{f.filename}")
end
end
end

View File

@@ -0,0 +1,56 @@
# frozen_string_literal: true
require 'spec_helper'
java_7_path = '/usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java'
java_7_home = '/usr/lib/jvm/java-7-openjdk-amd64'
java_8_path = '/usr/lib/jvm/oracle-java8-jre-amd64/bin/java'
java_8_home = '/usr/lib/jvm/oracle-java8-jre-amd64'
def unlink_and_delete(filename)
if File.symlink?(filename)
File.unlink(filename)
end
return unless File.exist?(filename)
File.delete(filename)
end
def symlink_and_test(symlink_path, java_home)
File.symlink(symlink_path, './java_test')
expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('./java_test')
expect(File).to receive(:realpath).with('./java_test').and_return(symlink_path)
expect(Facter.value(:java_default_home)).to eql java_home
end
describe 'java_default_home' do
before(:each) do
Facter.clear
allow(Facter.fact(:kernel)).to receive(:value).once.and_return('Linux')
end
context 'when java found in PATH' do
context 'when java is in /usr/lib/jvm/java-7-openjdk-amd64/jre/bin/java' do
it do
unlink_and_delete('./java_test')
symlink_and_test(java_7_path, java_7_home)
unlink_and_delete('./java_test')
end
end
context 'when java is in /usr/lib/jvm/oracle-java8-jre-amd64/bin/java' do
it do
unlink_and_delete('./java_test')
symlink_and_test(java_8_path, java_8_home)
unlink_and_delete('./java_test')
end
end
end
context 'when java not present, return nil' do
it do
allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
expect(Facter::Util::Resolution).to receive(:which).with('java').at_least(1).and_return(nil)
expect(Facter.value(:java_default_home)).to be_nil
end
end
end

View File

@@ -0,0 +1,28 @@
# frozen_string_literal: true
require 'spec_helper'
describe 'java_libjvm_path' do
let(:java_default_home) { '/usr/lib/jvm/java-8-openjdk-amd64' }
before(:each) do
Facter.clear
allow(Facter.fact(:kernel)).to receive(:value).and_return('Linux')
allow(Facter.fact(:java_default_home)).to receive(:value).and_return(java_default_home)
end
context 'when libjvm exists' do
it do
allow(Facter.fact(:java_major_version)).to receive(:value).and_return(8)
allow(Dir).to receive(:glob).with("#{java_default_home}/jre/lib/**/libjvm.so").and_return(['/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server/libjvm.so'])
expect(Facter.value(:java_libjvm_path)).to eql '/usr/lib/jvm/java-8-openjdk-amd64/jre/lib/amd64/server'
end
end
context 'when libjvm does not exist' do
it do
allow(Dir).to receive(:glob).with("#{java_default_home}/lib/**/libjvm.so").and_return([])
expect(Facter.value(:java_libjvm_path)).to be nil
end
end
end

View File

@@ -1,27 +1,27 @@
require "spec_helper" # frozen_string_literal: true
describe Facter::Util::Fact do require 'spec_helper'
before {
describe 'java_major_version' do
before(:each) do
Facter.clear Facter.clear
} end
describe "java_major_version" do context 'when java_version fact present, returns major version' do
context 'returns major version when java_version fact present' do
before :each do before :each do
Facter.fact(:java_version).stubs(:value).returns('1.7.0_71') allow(Facter.fact(:java_version)).to receive(:value).and_return('1.7.0_71')
end end
it do it do
expect(Facter.fact(:java_major_version).value).to eq("7") expect(Facter.fact(:java_major_version).value).to eq('7')
end end
end end
context 'returns nil when java not present' do context 'when java not present, returns nil' do
before :each do before :each do
Facter.fact(:java_version).stubs(:value).returns(nil) allow(Facter.fact(:java_version)).to receive(:value).and_return(nil)
end end
it do it do
expect(Facter.fact(:java_major_version).value).to be_nil expect(Facter.fact(:java_major_version).value).to be_nil
end end
end end
end
end end

View File

@@ -1,31 +1,27 @@
require "spec_helper" # frozen_string_literal: true
describe Facter::Util::Fact do require 'spec_helper'
before {
describe 'java_patch_level' do
before(:each) do
Facter.clear Facter.clear
} end
describe "java_patch_level" do context 'when java is installed returns java patch version extracted from java_version fact' do
context "if java is installed" do
context 'returns java patch version extracted from java_version fact' do
before :each do before :each do
Facter.fact(:java_version).stubs(:value).returns('1.7.0_71') allow(Facter.fact(:java_version)).to receive(:value).and_return('1.7.0_71')
end end
it do it do
expect(Facter.fact(:java_patch_level).value).to eq("71") expect(Facter.fact(:java_patch_level).value).to eq('71')
end
end end
end end
context "if java is not installed" do context 'when java is not installed returns nil' do
context 'returns nil' do
before :each do before :each do
Facter.fact(:java_version).stubs(:value).returns(nil) allow(Facter.fact(:java_version)).to receive(:value).and_return('nil')
end end
it do it do
expect(Facter.fact(:java_patch_level).value).to be_nil expect(Facter.fact(:java_patch_level).value).to be_nil
end end
end end
end
end
end end

View File

@@ -1,92 +1,95 @@
require "spec_helper" # frozen_string_literal: true
describe Facter::Util::Fact do require 'spec_helper'
before {
openjdk_7_output = "Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true\n"\
"openjdk version \"1.7.0_71\"\n"\
"OpenJDK Runtime Environment (build 1.7.0_71-b14)\n"\
"OpenJDK 64-Bit Server VM (build 24.71-b01, mixed mode)\n"
jdk_7_hotspot_output = "Picked up JAVA_TOOL_OPTIONS: -Djava.net.preferIPv4Stack=true\n"\
"java version \"1.7.0_71\"\n"\
"Java(TM) SE Runtime Environment (build 1.7.0_71-b14)\n"\
"Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)\n"
describe 'java_version' do
before(:each) do
Facter.clear Facter.clear
} end
describe "java_version" do context 'when java present, returns java version' do
context 'returns java version when java present' do context 'on OpenBSD', with_env: true do
context 'on OpenBSD', :with_env => true do before(:each) do
before do allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD')
Facter.fact(:operatingsystem).stubs(:value).returns("OpenBSD")
end end
let(:facts) { {:operatingsystem => 'OpenBSD'} } let(:facts) { { operatingsystem: 'OpenBSD' } }
it do it do
java_version_output = <<-EOS expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('/usr/local/jdk-1.7.0/jre/bin/java')
openjdk version "1.7.0_71" expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(openjdk_7_output)
OpenJDK Runtime Environment (build 1.7.0_71-b14) expect(Facter.value(:java_version)).to eq('1.7.0_71')
OpenJDK 64-Bit Server VM (build 24.71-b01, mixed mode)
EOS
Facter::Util::Resolution.expects(:which).with("java").returns('/usr/local/jdk-1.7.0/jre/bin/java')
Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
expect(Facter.value(:java_version)).to eq("1.7.0_71")
end end
end end
context 'on Darwin' do context 'when on Darwin' do
before do before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns("Darwin") allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin')
end end
let(:facts) { {:operatingsystem => 'Darwin'} } let(:facts) { { kernel: 'Darwin' } }
it do it do
java_version_output = <<-EOS expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').and_return('/Library/Java/JavaVirtualMachines/jdk1.7.0_71.jdk/Contents/Home')
java version "1.7.0_71" expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(jdk_7_hotspot_output)
Java(TM) SE Runtime Environment (build 1.7.0_71-b14) expect(Facter.value(:java_version)).to eql '1.7.0_71'
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"
end end
end end
context 'on other systems' do context 'when on other systems' do
before do before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns("MyOS") allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS')
end end
let(:facts) { {:operatingsystem => 'MyOS'} } let(:facts) { { operatingsystem: 'MyOS' } }
it do it do
java_version_output = <<-EOS expect(Facter::Util::Resolution).to receive(:which).with('java').and_return('/path/to/java')
java version "1.7.0_71" expect(Facter::Util::Resolution).to receive(:exec).with('java -Xmx12m -version 2>&1').and_return(jdk_7_hotspot_output)
Java(TM) SE Runtime Environment (build 1.7.0_71-b14) expect(Facter.value(:java_version)).to eq('1.7.0_71')
Java HotSpot(TM) 64-Bit Server VM (build 24.71-b01, mixed mode)
EOS
Facter::Util::Resolution.expects(:exec).with("java -Xmx8m -version 2>&1").returns(java_version_output)
expect(Facter.value(:java_version)).to eq("1.7.0_71")
end end
end end
end end
context 'returns nil when java not present' do context 'when java not present, returns nil' do
context 'on OpenBSD', :with_env => true do context 'on OpenBSD', with_env: true do
before do before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns("OpenBSD") allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('OpenBSD')
end end
let(:facts) { {:operatingsystem => 'OpenBSD'} } let(:facts) { { operatingsystem: 'OpenBSD' } }
it do it do
Facter::Util::Resolution.stubs(:exec) allow(Facter::Util::Resolution).to receive(:exec) # Catch all other calls
allow(Facter::Util::Resolution).to receive(:which).and_return(nil)
expect(Facter.value(:java_version)).to be_nil expect(Facter.value(:java_version)).to be_nil
end end
end end
context 'on Darwin' do context 'when on Darwin' do
before do before(:each) do
Facter.fact(:operatingsystem).stubs(:value).returns("Darwin") allow(Facter.fact(:kernel)).to receive(:value).and_return('Darwin')
end end
let(:facts) { {:operatingsystem => 'Darwin'} } let(:facts) { { kernel: 'Darwin' } }
it do 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)".') expect(Facter::Util::Resolution).to receive(:exec).with('/usr/libexec/java_home --failfast 2>&1').at_least(1).and_return('Unable to find any JVMs matching version "(null)".')
Facter.value(:java_version).should be_nil
end
end
context 'on other systems' do
before do
Facter.fact(:operatingsystem).stubs(:value).returns("MyOS")
end
let(:facts) { {:operatingsystem => 'MyOS'} }
it do
Facter::Util::Resolution.expects(:which).at_least(1).with("java").returns(false)
expect(Facter.value(:java_version)).to be_nil expect(Facter.value(:java_version)).to be_nil
end end
end end
context 'when on other systems' do
before(:each) do
allow(Facter.fact(:operatingsystem)).to receive(:value).and_return('MyOS')
end
let(:facts) { { operatingsystem: 'MyOS' } }
it do
expect(Facter::Util::Resolution).to receive(:which).at_least(1).with('java').and_return(false)
expect(Facter.value(:java_version)).to be_nil
end
end end
end end
end end