From 5205360be8534ed103a7fe302f9ca732f733ccc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micka=C3=ABl=20Can=C3=A9vet?=
<mickael.canevet@camptocamp.com>
Date: Wed, 4 May 2016 09:45:12 +0200
Subject: [PATCH] Update with modulesync
---
Gemfile | 3 +--
Rakefile | 12 ++++++------
spec/acceptance/nodesets/debian-6.yml | 2 +-
3 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/Gemfile b/Gemfile
index 53422d9..f0d7a49 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,7 +1,7 @@
source ENV['GEM_SOURCE'] || "https://rubygems.org"
group :development, :unit_tests do
- gem 'rake', :require => false
+ gem 'rake', ' < 11.0', :require => false if RUBY_VERSION =~ /^1\.8/
gem 'rspec', '< 3.2', :require => false if RUBY_VERSION =~ /^1\.8/
gem 'rspec-puppet', :require => false
gem 'puppetlabs_spec_helper', :require => false
@@ -22,7 +22,6 @@ group :development, :unit_tests do
gem 'puppet-lint-alias-check', :require => false
gem 'rspec-puppet-facts', :require => false
gem 'ruby-augeas', :require => false
- gem 'github_changelog_generator', '< 1.10.2', :require => false if RUBY_VERSION !~ /^1\.8/
gem 'puppet-blacksmith', :require => false if RUBY_VERSION !~ /^1\./
end
diff --git a/Rakefile b/Rakefile
index e204f08..61faa29 100644
--- a/Rakefile
+++ b/Rakefile
@@ -14,10 +14,10 @@ PuppetSyntax.exclude_paths = ["spec/fixtures/**/*.pp", "vendor/**/*"]
unless RUBY_VERSION =~ /^1\./
require 'puppet_blacksmith'
require 'puppet_blacksmith/rake_tasks'
- require 'github_changelog_generator/task'
- GitHubChangelogGenerator::RakeTask.new :changelog do |config|
- m = Blacksmith::Modulefile.new
- config.future_release = m.version
- config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
- end
+ #require 'github_changelog_generator/task'
+ #GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+ # m = Blacksmith::Modulefile.new
+ # config.future_release = m.version
+ # config.release_url = "https://forge.puppetlabs.com/#{m.author}/#{m.name}/%s"
+ #end
end
diff --git a/spec/acceptance/nodesets/debian-6.yml b/spec/acceptance/nodesets/debian-6.yml
index 3e53be3..d7b0275 100644
--- a/spec/acceptance/nodesets/debian-6.yml
+++ b/spec/acceptance/nodesets/debian-6.yml
@@ -5,7 +5,7 @@ HOSTS:
strict_variables:
platform: debian-6-amd64
hypervisor : docker
- image: debian:6
+ image: debian/eol:squeeze
docker_preserve_image: true
docker_cmd: '["/sbin/init"]'
docker_image_commands:
--
GitLab