Commit graph

635 commits

Author SHA1 Message Date
Daniele Sluijters
6619ad843f Merge pull request #372 from jbondpdx/revised-readme
DOC-249: Revised and updated apt readme
2014-10-08 17:24:49 -07:00
Hunter Haugen
d24c568779 Merge pull request #373 from mhaskel/metadata
Update pe compatibility
2014-10-08 15:19:32 -07:00
Morgan Haskel
b10415be63 Update pe compatibility 2014-10-08 18:18:39 -04:00
jbondpdx
b2c40388e5 DOC-249 Revised and updated apt readme
Revised and updated apt readme. Post-merge-conflict edition.
2014-10-08 11:09:54 -07:00
Colleen Murphy
3a8a5f75b8 Merge pull request #371 from mhaskel/force-yes
add --force-yes so deb7 doesn't hang
2014-10-07 09:37:06 -07:00
Morgan Haskel
c5edc86c3c add --force-yes so deb7 doesn't hang 2014-10-06 19:44:19 -04:00
Colleen Murphy
ac15a0e2f4 Merge pull request #369 from mhaskel/future_parser
Missed one case for _kick_apt needed for strict variables
2014-10-06 13:53:17 -07:00
Morgan Haskel
049e993511 Missed one case for _kick_apt needed for strict variables 2014-10-06 16:41:14 -04:00
Hunter Haugen
4b66a64940 Merge pull request #368 from mhaskel/future_parser
Fix for future parser support
2014-10-03 16:36:21 -07:00
Morgan Haskel
c41e71d0c2 Fix for future parser support 2014-10-03 19:30:33 -04:00
Hunter Haugen
873e49478d Merge pull request #367 from mhaskel/deb6_apt-key_workaround
apt-key doesn't add long keys in deb6
2014-10-02 15:37:17 -07:00
Morgan Haskel
a3d4822920 apt-key doesn't add long keys in deb6
You can feed the command the long key, but it truncates it to add the
key. This causes issues due to the short-key collision with the
puppetlabs key. So, test with a different key on debian 6.
2014-10-02 17:21:46 -05:00
Hunter Haugen
73867f03b5 Merge pull request #366 from mhaskel/fix_unit_tests
We aren't truncating in the type
2014-10-01 11:55:20 -07:00
Morgan Haskel
febda27623 We aren't truncating in the type
So don't check for truncated IDs in the type test.
2014-10-01 13:46:14 -05:00
Hunter Haugen
1e1f61a636 Merge pull request #365 from mhaskel/long_key_support
Don't truncate to short keys in the type
2014-10-01 11:43:09 -07:00
Morgan Haskel
87f3f1023c Don't truncate to short keys in the type
You should be able to create/delete keys using the long key to avoid
collisions, and truncating in the type makes that not work.
2014-10-01 13:40:25 -05:00
Morgan Haskel
43b894b12e Merge pull request #349 from wolfspyre/apt_update_tooling
Apt update tooling
2014-09-26 15:01:16 -04:00
Wolf Noble
7a192d7bea - add bits for updating apt
- fix spec tests to include osfamily fact
- add spec tests to verify current default behavior unimpacted.
- manage the update-stamp file in puppet via content rather than a served file.
- update custom fact to return -1 if the file doesn't exist
- add spec test for custom fact
- refactor to use a variable vs a collector/override
- document parameters a bit more verbosely
- remove empty unconstrained fact
- Add osfamily fact to backports tests to facilitate functional tests on non-debian hosts
2014-09-24 16:29:27 -07:00
Daniele Sluijters
761a4d26c7 Fix a test that broke with #326. 2014-09-24 15:27:06 -07:00
Daniele Sluijters
dde7f4e819 Merge pull request #326 from dabido/master
Builddep notifies apt-get update instead of requiring it
2014-09-24 15:01:17 -07:00
Morgan Haskel
483a0f86ab Merge pull request #363 from martinseener/ticket/1306-apt_force_fails_if_new_package_asks_how_to_handle_changed_config_files
apt::force: Added 2 parameters for automatic configuration file handling...
2014-09-24 14:58:13 -07:00
Martin Seener
93567aef4a apt::force: Added 2 parameters for automatic configuration file handling; fixes #modules-1306
when updating or installing newer packages with apt::force and you have changed previous
configuration files aptitude or apt-get will prompt what to do. You can suppress that
by pre-define the action with cfg_files parameter (new, old or unchanged and its backward
compatible if not defined). With a second optional parameter cfg_missing you can force
your provider to install missing configuration files as well.

Signed-off-by: Martin Seener <martin@seener.de>

apt::force: Changed selectors used in force.pp to case statements; refs #module-1306

Signed-off-by: Martin Seener <martin@seener.de>

apt::force: rspec: fixed the failing tests and added validate_re for cfg_files and validate_bool for cfg_missing. Also removed default values for both case statements and only allow pre-defined values or true/false. Furthermore enhanced the README refs #module-1306

Was able to fix the failing rspec tests for the patch.
Thanks to Morgan Haskel.

Signed-off-by: Martin Seener <martin@seener.de>

Despite the puppetlabs-stdlib documentation says validation_re supports 3 arguments the tests failed telling that only 2 are supported. Fixed this by removing the 3 optional argument; refs #modules-1306

Signed-off-by: Martin Seener <martin.seener@barzahlen.de>

apt::force: updated readme refs #module-1306

Signed-off-by: Martin Seener <martin@seener.de>
2014-09-22 19:53:45 +02:00
Travis Fields
932c3a7e6b Merge pull request #362 from jbondpdx/apt-readme
MODULES-1259: added info on apt::update + edits to readme.md
2014-09-17 09:06:38 -07:00
jbondpdx
67f6355c2d MODULES-1259: added info on apt::update + edits to readme.md
Added apt::update information to the Readme file. Also general copy editing throughout for clarity and consistent style.
2014-09-16 16:51:24 -07:00
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
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
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