Commit graph

965 commits

Author SHA1 Message Date
Morgan Haskel
622a05ab88 Merge pull request #360 from mhaskel/test
Merge 1.6.x into master
2014-09-15 14:27:27 -07:00
Morgan Haskel
6540b7ba24 Merge branch '1.6.x' into test 2014-09-12 17:24:49 -04:00
Daniele Sluijters
df8f80aedb Merge pull request #359 from haus/ticket/master/doc_1230_update_example_keys
(DOC-1230) Update all short key examples to use the long key id
2014-09-10 22:25:17 +02:00
Matthaus Owens
db556a0a5a (DOC-1230) Update all short key examples to use the long key id 2014-09-10 13:21:07 -07:00
Morgan Haskel
b99d713ea2 Merge pull request #358 from cyberious/1.6.x
Fix issue with puppet_module_install, removed and using updated method f...
2014-09-10 13:44:23 -04:00
Travis Fields
8fa73ac96f Fix issue with puppet_module_install, removed and using updated method from beaker core copy_module_to 2014-09-10 10:37:07 -07:00
Daniele Sluijters
0e804448a9 Merge pull request #357 from cmurphy/unpin-puppetlint
Unpin puppet-lint
2014-09-08 11:09:24 +02:00
Colleen Murphy
d92513261b Unpin puppet-lint
The issues associated with the 1.0.0 release of puppet-lint have been
resolved.
2014-09-07 11:12:28 -07:00
Daniele Sluijters
29e6e09d7a Merge pull request #350 from cmurphy/master
Remove Puppet 2.7 from travis matrix
2014-09-07 11:56:32 +02:00
Daniele Sluijters
bc55471caa Merge pull request #353 from Smartesting/add-support-for-linuxmint-operatingsystem
add support for LinuxMint operating system
2014-09-07 11:56:08 +02:00
Daniele Sluijters
32e2b6c480 Merge pull request #356 from digitalmediacenter/fix_puppet_lint_errors
Fix some Puppet Lint errors
2014-09-05 19:23:01 +02:00
Matthias Baur
1044886150 Fix some Puppet Lint errors 2014-09-05 18:51:39 +02:00
Christophe Bliard
ec3c20e288 Prefer if/else over ? selector with default 2014-08-29 16:57:09 +02:00
Christophe Bliard
636cacd72c add support for LinuxMint operating system 2014-08-29 16:23:21 +02:00
Ashley Penney
fbddf14960 Merge pull request #352 from mhaskel/spec_helper_updates
Only call install_* methods once
2014-08-28 17:39:56 -04:00
Morgan Haskel
ae28193ce4 Only call install_* methods once 2014-08-28 11:16:09 -04:00
Colleen Murphy
018a31a0ec Pin puppet-lint to 0.3.2 2014-08-19 13:45:39 -07:00
Colleen Murphy
4dc8e8f462 Add testing on Ruby 1.8.7 with Puppet 3 to travis.yml 2014-08-19 10:50:58 -07:00
Colleen Murphy
af02b9c8a7 Remove Puppet 2.7 from travis matrix 2014-08-19 10:17:42 -07:00
Morgan Haskel
4d9d9e126e Merge pull request #348 from hunner/patch_fact
Remove stderr from stdout
2014-08-15 19:24:34 -04:00
Hunter Haugen
ea9f902543 Remove stderr from stdout
Sometimes there are lib errors on platforms with malformed packages.
This shouldn't cause the facts to completely fail.
2014-08-15 16:22:46 -07:00
Ashley Penney
6a95ab6156 Merge pull request #347 from mhaskel/hiera_fix
Don't hardcode /etc/puppet as the puppetpath.
2014-08-12 16:14:31 -04:00
Morgan Haskel
442ca30870 Don't hardcode /etc/puppet as the puppetpath. 2014-08-12 16:10:36 -04:00
Hunter Haugen
45a798eead Merge pull request #346 from mhaskel/1.6_test_fixes
Clean up test failures
2014-08-12 11:17:57 -07:00
Morgan Haskel
c69fb2cd24 Clean up test failures 2014-08-12 13:45:37 -04:00
Ashley Penney
239232bbd4 Merge pull request #345 from mhaskel/merge_1.5.x_changes
Merge 1.5.x changes
2014-08-12 12:48:44 -04:00
Morgan Haskel
c7b88aae38 Missed test refactoring in CHANGELOG 2014-08-12 12:12:21 -04:00
Morgan Haskel
5d7982dba0 Cleaned up unit tests. 2014-08-12 12:09:04 -04:00
Morgan Haskel
ce846d0118 Cleaned up acceptance tests
A lot of the tests were testing things that really should be tested via
unit tests, so those were deleted and unit tests will be revamped to
make sure they are covering everything they need to be covering.

Conflicts:
	spec/acceptance/unattended_upgrade_spec.rb
2014-08-12 12:09:04 -04:00
Morgan Haskel
08043adb75 Sometimes killing apt is too aggressive. 2014-08-12 12:09:04 -04:00
Morgan Haskel
4688bfaf81 1.5.3 prep 2014-08-12 12:08:57 -04:00
Colleen Murphy
e15a8fa9fa Update .sync.yml to support new .travis.yml configs 2014-08-12 11:51:41 -04:00
Colleen Murphy
1ad3ad8da6 Add configuration file for modulesync
https://github.com/puppetlabs/modulesync
2014-08-12 11:44:39 -04:00
Morgan Haskel
f4dd4f8ab5 Merge branch '1.6.x' of github.com:puppetlabs/puppetlabs-apt into 1.6.x 2014-08-07 14:52:17 -04:00
Morgan Haskel
5018cb5191 Prep for 1.6.0 release. 2014-08-07 14:50:30 -04:00
Ashley Penney
13afe8b7af Merge pull request #339 from mhaskel/test_overhaul
Test overhaul
2014-08-06 12:25:14 -04:00
Morgan Haskel
d6bdb4d925 Cleaned up unit tests. 2014-08-04 19:44:19 -04:00
Morgan Haskel
4ed9cb5099 Cleaned up acceptance tests
A lot of the tests were testing things that really should be tested via
unit tests, so those were deleted and unit tests will be revamped to
make sure they are covering everything they need to be covering.
2014-08-04 19:20:07 -04:00
Morgan Haskel
e970aa9a6d Merge pull request #333 from wilman0/master
Fix for debian/ubuntu hold and a way to add debian src only
2014-07-31 12:58:20 -04:00
wilman0
538a9f9aab Update hold.pp
fix for default debian installations

all files in /etc/apt/preferences without _ will be silently ignore according to debian manpage. Addionally its not a good idea to write versionnumber in filename cause there is no way to delete this files if you increase versionumber

Update source_spec.rb

add a way to include debsrc only (useful for debian/ubuntu build server ... jenkins ect)

Update source_spec.rb

var rename

Update source.list.erb

add include_deb "switch"

Update source.pp

"include_deb" defaultvalue = true

Update hold_spec.rb

change the name of the preferences file (hold)

Update source_spec.rb

Update README.md

Doku: 'include_deb' included next to 'include_src' in examples

Update README.md

typo
2014-07-31 18:40:46 +02:00
Ashley Penney
a68eca58a6 Merge pull request #336 from mhaskel/fix_acceptance_tests
Debian seems to have hanging apt-get and/or dpkg processes, so kill
2014-07-30 15:09:40 -04:00
Morgan Haskel
84b53dcde4 Merge pull request #330 from dantman/master
Fix inconsistent $proxy_host handling in apt and apt::ppa.
2014-07-30 14:44:51 -04:00
Morgan Haskel
66e05edbe7 Debian seems to have hanging apt-get and/or dpkg processes, so kill
those.
2014-07-30 14:40:20 -04:00
Ashley Penney
bc2febe71f Merge pull request #335 from mhaskel/fix_acceptance_tests
Fix broken acceptance tests.
2014-07-30 12:06:08 -04:00
Morgan Haskel
f02f9b8465 Fix broken acceptance tests.
New fact was added that matched a regex breaking the always_apt_update
tests.  Updated the tests to check for the apt_update exec, not just the
string apt_update.
2014-07-30 12:03:09 -04:00
Morgan Haskel
256a63b407 Merge pull request #329 from spuder/spuder/lsbdist
Adds check to params.pp if lab-release is not installed
2014-07-29 19:24:30 -04:00
Morgan Haskel
76a508c710 Prep for 1.6.0 release. 2014-07-25 18:20:06 -04:00
Ashley Penney
3a2fe3b1ae Merge pull request #334 from mhaskel/1.5.x-merge
1.5.x merge
2014-07-25 11:56:43 -04:00
Morgan Haskel
23149c9a3a Merge remote-tracking branch 'upstream/1.5.x' 2014-07-25 11:53:53 -04:00
Daniele Sluijters
60e50a9b65 Merge pull request #332 from zacharyalexstern/fix_readme_typo
Fix readme typo.
2014-07-17 08:42:06 +02:00