summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniele Sluijters <daenney@users.noreply.github.com>2015-04-23 09:03:18 +0200
committerDaniele Sluijters <daenney@users.noreply.github.com>2015-04-23 09:51:28 +0200
commitc682910e61b54fa6377a553ee56640fb7eaf1887 (patch)
treea4d0270c64df23ff80086b5cd5a79f4b852b99c6
parente21c0c7485b80120cef9ea3240d4ff2dd35ac9d0 (diff)
Upgrade dependencies
* Use rspec-puppet 2.1+ (which now supports Puppet 4) * No longer allow the Puppet 4 builds to fail (the tests can run now) * Use the released version of the apt module
-rw-r--r--.fixtures.yml3
-rw-r--r--.travis.yml2
-rw-r--r--CHANGELOG.md5
-rw-r--r--Gemfile2
4 files changed, 5 insertions, 7 deletions
diff --git a/.fixtures.yml b/.fixtures.yml
index 5326b19..5811afc 100644
--- a/.fixtures.yml
+++ b/.fixtures.yml
@@ -3,9 +3,8 @@ fixtures:
stdlib:
repo: "puppetlabs-stdlib"
ref: "4.6.0"
- repositories:
apt:
- repo: "https://github.com/puppetlabs/puppetlabs-apt.git"
+ repo: "puppetlabs-apt"
ref: "2.0.0"
symlinks:
unattended_upgrades: "#{source_dir}"
diff --git a/.travis.yml b/.travis.yml
index b7ad44c..12a6d7a 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,8 +13,6 @@ matrix:
env: PUPPET_VERSION="~> 3.0" STRICT_VARIABLES="yes" ORDERING="random" FUTURE_PARSER="yes"
- rvm: 2.1
env: PUPPET_VERSION="~> 4.0" ORDERING="random"
- allow_failures:
- - env: PUPPET_VERSION="~> 4.0" ORDERING="random"
notifications:
email: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4467c47..5c8865b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,8 @@ All notable changes to this project will be documented in this file.
This project adheres to [Semantic Versioning](http://semver.org/).
## [Unreleased][unreleased]
-
+## Changed
+- Tested on Puppet 4
## [1.0.2] - 2015-04-22
### Changed
@@ -20,6 +21,6 @@ This project adheres to [Semantic Versioning](http://semver.org/).
- README with full documentation.
- Boilerplate such as Gemfile, Travis configuration, LICENSE and so on.
-[unreleased]: https://github.com/puppet-community/puppet-unattended_upgrades/compare/1.0.1...HEAD
+[unreleased]: https://github.com/puppet-community/puppet-unattended_upgrades/compare/1.0.2...HEAD
[1.0.2]: https://github.com/puppet-community/puppet-unattended_upgrades/compare/1.0.2...1.0.1
[1.0.1]: https://github.com/puppet-community/puppet-unattended_upgrades/compare/1.0.1...1.0.0
diff --git a/Gemfile b/Gemfile
index cce9320..9e1482d 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,7 +4,7 @@ group :test do
gem "rake"
gem "puppet", ENV['PUPPET_VERSION'] || '~> 3.7.0'
gem "rspec", '< 3.2.0'
- gem "rspec-puppet", :git => 'https://github.com/rodjek/rspec-puppet.git'
+ gem "rspec-puppet", '~> 2.1'
gem "puppetlabs_spec_helper"
gem "metadata-json-lint"
gem "rspec-puppet-facts"