Skip to content

Commit

Permalink
[MODULES-4528] Replace Puppet.version.to_f version comparison from sp…
Browse files Browse the repository at this point in the history
…ec_helper.rb
  • Loading branch information
Wilson McCoubrey committed Mar 22, 2017
1 parent 2a5a48a commit bc9a8fb
Show file tree
Hide file tree
Showing 4 changed files with 44 additions and 12 deletions.
6 changes: 3 additions & 3 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#This file is generated by ModuleSync, do not edit.
*.rb eol=lf
*.rb eol=lf
*.erb eol=lf
*.pp eol=lf
*.sh eol=lf
*.pp eol=lf
*.sh eol=lf
2 changes: 0 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,6 @@ group :system_tests do
gem 'beaker-hostgenerator', *location_for(ENV['BEAKER_HOSTGENERATOR_VERSION'])
gem 'beaker-abs', *location_for(ENV['BEAKER_ABS_VERSION'] || '~> 0.1')
gem 'beaker-windows', '~> 0.6', :require => false
gem 'rototiller', '~> 1.0.0', :require => false

end

gem 'puppet', *location_for(ENV['PUPPET_GEM_VERSION'])
Expand Down
26 changes: 26 additions & 0 deletions locales/config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
---
# This is the project-specific configuration file for setting up
# fast_gettext for your project.
gettext:
# This is used for the name of the .pot and .po files; they will be
# called <project_name>.pot?
project_name: puppetlabs-chocolatey
# This is used in comments in the .pot and .po files to indicate what
# project the files belong to and should bea little more desctiptive than
# <project_name>
package_name: puppetlabs-chocolatey
# The locale that the default messages in the .pot file are in
default_locale: en
# The email used for sending bug reports.
bugs_address: [email protected]
# The holder of the copyright.
copyright_holder: Puppet, Inc.
# This determines which comments in code should be eligible for translation.
# Any comments that start with this string will be externalized. (Leave
# empty to include all.)
comments_tag: TRANSLATOR
# Patterns for +Dir.glob+ used to find all files that might contain
# translatable content, relative to the project root directory
source_files:
- 'metadata.json'

22 changes: 15 additions & 7 deletions spec/acceptance/nodesets/default.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,18 @@
---
HOSTS:
ubuntu-1404-x64:
windows2012-64-1:
pe_dir:
pe_ver:
pe_upgrade_dir:
pe_upgrade_ver:
hypervisor: vmpooler
platform: windows-2012-64
ruby_arch: x64
template: win-2012-x86_64
roles:
- agent
- default
platform: ubuntu-14.04-amd64
hypervisor: vagrant
box: puppetlabs/ubuntu-14.04-64-nocm
- agent
- default
CONFIG:
type: foss
nfs_server: none
consoleport: 443
pooling_api: http://vmpooler.delivery.puppetlabs.net/

0 comments on commit bc9a8fb

Please sign in to comment.