Commit Graph

505 Commits

Author SHA1 Message Date
Hunter Haugen
8eee08c143 Merge pull request #142 from DavidS/MODULES-2637-java_version_on_OSX
(MODULES-2637) Checks java actually installed
2015-10-01 11:20:49 -07:00
David Schmitt
dadc7a6c22 (MODULES-2637) Checks java actually installed
The other method for running which java doesn't work on OSX, as java is installed as an empty shim when not installed in the base OSX image:

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

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

Originally-by: Peter Souter <peter.souter@puppetlabs.com>
2015-10-01 19:09:32 +01:00
David Schmitt
3645364e5b (MAINT) declare an exclusion filter for the tests using with_env on facter 1.6
The with_env function is not available in facter 1.6 and OpenBSD is not
supported.
2015-10-01 19:09:32 +01:00
Hunter Haugen
913a810bfd Merge pull request #141 from vrtdev/feature/fix_spec_deprecation_warnings
Fix rspec deprecation warnings. .should -> expect().to
2015-09-28 21:47:57 -07:00
Jan Vansteenkiste
8bef423733 Fix rspec deprecation warnings. .should -> expect().to 2015-09-29 06:44:30 +02:00
Bryan Jen
abd490dc6a Merge pull request #137 from puppetlabs/1.4.x
mergeback 1.4.x
2015-07-15 15:39:00 -07:00
Bryan Jen
7c70ceaed7 Merge pull request #136 from hunner/release_1.4.1
Release 1.4.1
1.4.1
2015-07-15 13:33:32 -07:00
Hunter Haugen
76c5d2c93d Release 1.4.1 2015-07-15 13:14:56 -07:00
Hunter Haugen
8e5b079fd7 Merge pull request #135 from zreichert/fix
Add OEL operatingsystem to java::params
2015-07-14 10:06:44 -07:00
Zach Reichert
e8b3dd534f Add OEL operatingsystem to java::params 2015-07-14 10:03:56 -07:00
Hunter Haugen
9efcb78c1f Merge pull request #134 from mhaskel/merge_1.4.x_to_master
Merge 1.4.x to master
2015-07-09 14:57:39 -07:00
Morgan Haskel
d07a3551c7 Merge pull request #133 from hunner/fix_metadata
Fix incorrect metadata
1.4.0
2015-07-07 10:12:18 -07:00
Hunter Haugen
911b497725 Fix incorrect metadata 2015-07-07 10:11:36 -07:00
Morgan Haskel
9e85843369 Merge pull request #132 from bmjen/1.4.0-prep
updates metadata.json to include support for PE up to 2015.2.x
2015-07-06 16:34:35 -07:00
Bryan Jen
b04fbac5af updates metadata.json to include support for PE up to 2015.2.x 2015-07-06 16:33:22 -07:00
Morgan Haskel
17dfb850db Merge pull request #131 from bmjen/1.4.0-prep
Release 1.4.0 prep
2015-07-06 13:27:40 -07:00
Bryan Jen
b058ce725c Release 1.4.0 prep 2015-07-06 13:17:27 -07:00
Bryan Jen
cf0c56b06f Merge pull request #126 from danielparks/require-update-java-alternatives
Install update-java-alternatives on Debian for the java::config class
2015-07-02 12:27:05 -07:00
Morgan Haskel
3a102bcde4 Merge pull request #129 from bmjen/fedora-support
(MODULES-2068) add fedora to metadata.json operatingsystem_support list
2015-07-01 16:43:13 -07:00
Joshua Hoblitt
907e727ad1 (MODULES-2068) add fedora to metadata.json operatingsystem_support list 2015-07-01 15:43:22 -07:00
Travis Fields
14cf5c4e5d Merge pull request #128 from bmjen/oracle-fun
(MODULES-2095) fixes create-java-alternatives command
2015-06-30 09:46:26 -07:00
Bryan Jen
4aac413e04 (MODULES-2095) fixes create-java-alternatives command 2015-06-29 14:07:40 -07:00
Hunter Haugen
a64efdff6e Merge pull request #127 from bmjen/fix-case-statement
re-orders case statements in manifests to workaround PUP-4520.
2015-06-24 13:50:44 -07:00
Bryan Jen
bfc03a54c5 re-orders case statements in manifests to workaround PUP-4520. 2015-06-24 13:49:19 -07:00
Daniel Parks
75fa927d72 Install update-java-alternatives on Debian for the java::config class. 2015-06-22 22:15:14 -07:00
Bryan Jen
a5500ff58e Merge pull request #123 from hunner/add_helper
Add helper to install puppet/pe/puppet-agent
2015-06-15 10:25:35 -07:00
Hunter Haugen
ec66670995 Add helper to install puppet/pe/puppet-agent 2015-06-11 16:54:34 -07:00
Bryan Jen
079c963e05 Merge pull request #122 from justinstoller/maint/master/set-puppet-version
(maint) allow setting PUPPET_VERSION in acceptance
2015-06-09 15:03:47 -07:00
Justin Stoller
ba817d0d56 (maint) allow setting PUPPET_VESION in acceptance 2015-06-08 22:16:59 -07:00
David Schmitt
42580b0121 Merge pull request #121 from puppetlabs/travisci_update
Updated travisci file to remove allow_failures on Puppet 4
2015-06-08 15:40:34 +01:00
Jonathan Tripathy
232258f290 Updated travisci file to remove allow_failures on Puppet 4 2015-06-08 14:24:41 +01:00
Hunter Haugen
0f194c7bb3 Add ability to unittest puppet 4 2015-05-27 08:12:30 -07:00
TP Honey
15909c4186 Merge pull request #109 from buzzdeee/master
Add support for OpenBSD, and also add some regression tests.
2015-05-15 11:48:47 +01:00
Bryan Jen
461209338f Merge pull request #118 from puppetlabs/modulesync_updates
Modulesync updates
2015-05-07 14:09:48 -07:00
Morgan Haskel
d1f6438adc beaker gemfile fixes 2015-05-06 14:32:38 -07:00
Morgan Haskel
0c73b6242b sync via modulesync 2015-05-06 14:30:49 -07:00
Morgan Haskel
d5aec12518 sync via modulesync 2015-05-06 14:10:14 -07:00
Sebastian Reitenbach
5815242f8e Add support for OpenBSD, and also add some regression tests.
Add info about OpenBSD support to README.md and metadata.json
Add a note about OpenBSD java_version fact to README.markdown.
Fixup wording on context in one of the java patch level regression tests.
No mentioning of OpenBSD in metdata.json

Cleanup wording of context as suggested by @elyscape
update contexts as suggested by @elyscape
2015-04-23 12:29:11 +02:00
Morgan Haskel
586195d6c9 Merge pull request #112 from haw-hh-ai-lab/support_ubuntu_vivid
Support ubuntu vivid
2015-04-06 10:02:22 -07:00
Lutz Behnke
e22aa3a36a add support for ubuntu vivid (15.04) using openjdk-8
add acceptance test node without really understanding what it does.
add test for distribution type jdk for Ubuntu vivid
2015-04-01 08:16:07 +02:00
Justin Stoller
1b9bb75de8 Merge pull request #115 from anodelman/master
(BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
2015-03-26 16:47:45 -07:00
Alice Nodelman
868fd0b920 (BKR-147) add Gemfile setting for BEAKER_VERSION for puppet...
puppetdb, etc

- support for BEAKER_VERSION and BEAKER_RSPEC_VERSION in gemfile
2015-03-24 14:48:58 -07:00
Morgan Haskel
0fa3f1a775 Merge pull request #114 from cmurphy/rspec-puppet-2
Test changes
2015-03-24 15:45:32 -04:00
Colleen Murphy
8db7120eed Update .travis.yml
This commit makes the following changes to the test matrix:

- Runs tests on ruby 2.1.5 instead of 2.0.0
- Runs tests on ruby 1.8.7 with puppet 3.x
- Adds an environment to run on an intermediate 3.x puppet version
  instead of latest (specifically 3.4.x)
- Adds an environment to run with the future parser on latest puppet.
  This would affect the test runs for the validate and spec checks.
- Adds environments to run with strict variables on latest puppet.
- Runs the tests on docker
2015-03-23 21:57:34 -07:00
Colleen Murphy
44a1992e83 Keep testing on puppet 2.7
The modulesync config repo is dropping universal support for puppet
2.7, but individual repos should still keep support until the next
naturally-occuring major release.
2015-03-23 12:12:38 -07:00
Colleen Murphy
d0a03f66c7 Ensure lint fails on warnings 2015-03-19 14:10:09 -07:00
Colleen Murphy
ce5529a03d Remove unneeded dependencies
puppetlabs_spec_helper handles these dependencies for us.
2015-03-19 14:10:03 -07:00
Colleen Murphy
5b45d1fede Update rspec tests for rspec-puppet 2
This patch uses `catalogue` instead of `subject` for the raise_error
matcher since `subject` is not evaluated the way it used to be. We also
unpin rspec-puppet.
2015-03-19 14:09:58 -07:00
Morgan Haskel
7a39d596bd Merge pull request #113 from jtappa/readme-edits
Edits to param descriptions and other small changes in the README.
2015-03-06 15:54:10 -08:00
Jorie Tappa
75fb20d0eb Edits to params and other small changes.
params are now alphabetized, descriptions are mostly the same but now
all include valid options and defaults.
2015-03-06 15:51:49 -08:00