API tools faq
paste
Advertisement
Guest User

Untitled

a guest
Aug 7th, 2015
254
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 7.45 KB | None | 0 0
raw download clone embed print report
  1. $ ./tools/sync-projects.sh puppet-nova
  2. Fetching: bundler-1.10.6.gem (100%)
  3. Successfully installed bundler-1.10.6
  4. Parsing documentation for bundler-1.10.6
  5. Installing ri documentation for bundler-1.10.6
  6. Done installing documentation for bundler after 2 seconds
  7. 1 gem installed
  8. Fetching gem metadata from https://rubygems.org/.........
  9. Fetching version metadata from https://rubygems.org/..
  10. Installing CFPropertyList 2.2.8
  11. Installing unf_ext 0.0.7.1 with native extensions
  12. Installing unf 0.1.4
  13. Installing domain_name 0.5.24
  14. Installing facter 2.4.4
  15. Installing git 1.2.9.1
  16. Installing json_pure 1.8.2
  17. Installing hiera 3.0.1
  18. Installing http-cookie 1.0.2
  19. Installing mime-types 2.6.1
  20. Installing puppet 4.2.1
  21. Installing netrc 0.10.3
  22. Installing rest-client 1.8.0
  23. Installing puppet-blacksmith 3.3.1
  24. Installing modulesync 0.5.0
  25. Using bundler 1.10.6
  26. Bundle complete! 1 Gemfile dependency, 16 gems now installed.
  27. Use `bundle show [gemname]` to see where a bundled gem is installed.
  28. Syncing puppet-nova
  29. Overriding any local changes to repositories in ./modules
  30. Switching to branch msync_automatic_update
  31. No config file under ./modules/puppet-nova/.sync.yml found, using default values
  32. Using no-op. Files in puppet-nova may be changed but will not be committed.
  33. Files changed:
  34. diff --git a/.gitignore b/.gitignore
  35. index 9897b6f..4dd84f0 100644
  36. --- a/.gitignore
  37. +++ b/.gitignore
  38. @@ -1,5 +1,10 @@
  39. -*.swp
  40. -spec/fixtures/modules/*
  41. -pkg
  42. +pkg/
  43. Gemfile.lock
  44. -.vagrant/*
  45. +vendor/
  46. +spec/fixtures/
  47. +.vagrant/
  48. +.bundle/
  49. +coverage/
  50. +.idea/
  51. +*.swp
  52. +*.iml
  53. diff --git a/Gemfile b/Gemfile
  54. index 9ea2113..6d4ce9a 100644
  55. --- a/Gemfile
  56. +++ b/Gemfile
  57. @@ -1,25 +1,30 @@
  58. -source 'https://rubygems.org'
  59. +source ENV['GEM_SOURCE'] || "https://rubygems.org"
  60.  
  61. group :development, :test do
  62. - gem 'puppetlabs_spec_helper', :require => false
  63. - gem 'rspec-puppet', '~> 2.1.0', :require => false
  64. -
  65. - gem 'metadata-json-lint'
  66. - gem 'puppet-lint-param-docs'
  67. - gem 'puppet-lint-absolute_classname-check'
  68. - gem 'puppet-lint-absolute_template_path'
  69. - gem 'puppet-lint-trailing_newline-check'
  70. + gem 'puppetlabs_spec_helper', :require => 'false'
  71. + gem 'rspec-puppet', '~> 2.2.0', :require => 'false'
  72. + gem 'metadata-json-lint', :require => 'false'
  73. + gem 'puppet-lint-param-docs', :require => 'false'
  74. + gem 'puppet-lint-absolute_classname-check', :require => 'false'
  75. + gem 'puppet-lint-absolute_template_path', :require => 'false'
  76. + gem 'puppet-lint-trailing_newline-check', :require => 'false'
  77. + gem 'puppet-lint-unquoted_string-check', :require => 'false'
  78. + gem 'puppet-lint-leading_zero-check', :require => 'false'
  79. + gem 'puppet-lint-variable_contains_upcase', :require => 'false'
  80. + gem 'puppet-lint-numericvariable', :require => 'false'
  81. + gem 'json', :require => 'false'
  82. + gem 'webmock', :require => 'false'
  83. +end
  84.  
  85. - # Puppet 4.x related lint checks
  86. - gem 'puppet-lint-unquoted_string-check'
  87. - gem 'puppet-lint-leading_zero-check'
  88. - gem 'puppet-lint-variable_contains_upcase'
  89. - gem 'puppet-lint-numericvariable'
  90. +group :system_tests do
  91. + gem 'beaker-rspec', :require => 'false'
  92. + gem 'beaker-puppet_install_helper', :require => 'false'
  93. +end
  94.  
  95. - gem 'beaker-rspec', :require => false
  96. - gem 'beaker-puppet_install_helper', :require => false
  97. - gem 'json'
  98. - gem 'webmock'
  99. +if facterversion = ENV['FACTER_GEM_VERSION']
  100. + gem 'facter', facterversion, :require => false
  101. +else
  102. + gem 'facter', :require => false
  103. end
  104.  
  105. if puppetversion = ENV['PUPPET_GEM_VERSION']
  106. diff --git a/Rakefile b/Rakefile
  107. index 56dc07d..bc08f43 100644
  108. --- a/Rakefile
  109. +++ b/Rakefile
  110. @@ -1,7 +1,21 @@
  111. require 'puppetlabs_spec_helper/rake_tasks'
  112. require 'puppet-lint/tasks/puppet-lint'
  113. +require 'puppet-syntax/tasks/puppet-syntax'
  114.  
  115. -PuppetLint.configuration.fail_on_warnings = true
  116. -PuppetLint.configuration.send('disable_80chars')
  117. -PuppetLint.configuration.send('disable_class_parameter_defaults')
  118. -PuppetLint.configuration.send('disable_class_inherits_from_params_class')
  119. +PuppetSyntax.exclude_paths ||= []
  120. +PuppetSyntax.exclude_paths << "spec/fixtures/**/*"
  121. +PuppetSyntax.exclude_paths << "pkg/**/*"
  122. +PuppetSyntax.exclude_paths << "vendor/**/*"
  123. +
  124. +Rake::Task[:lint].clear
  125. +PuppetLint::RakeTask.new :lint do |config|
  126. + config.ignore_paths = ["spec/**/*.pp", "vendor/**/*.pp"]
  127. + config.fail_on_warnings = true
  128. + config.log_format = '%{path}:%{linenumber}:%{KIND}: %{message}'
  129. + config.disable_checks = ["80chars", "class_inherits_from_params_class", "class_parameter_defaults", "only_variable_string"]
  130. +end
  131. +
  132. +desc "Run acceptance tests"
  133. +RSpec::Core::RakeTask.new(:acceptance) do |t|
  134. + t.pattern = 'spec/acceptance'
  135. +end
  136. diff --git a/spec/acceptance/nodesets/default.yml b/spec/acceptance/nodesets/default.yml
  137. index cba1cd0..3bb3e62 100644
  138. --- a/spec/acceptance/nodesets/default.yml
  139. +++ b/spec/acceptance/nodesets/default.yml
  140. @@ -3,9 +3,9 @@ HOSTS:
  141. roles:
  142. - master
  143. platform: ubuntu-14.04-amd64
  144. - box : puppetlabs/ubuntu-14.04-64-nocm
  145. - box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
  146. - hypervisor : vagrant
  147. + box: puppetlabs/ubuntu-14.04-64-nocm
  148. + box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
  149. + hypervisor: vagrant
  150. CONFIG:
  151. - log_level : debug
  152. + log_level: debug
  153. type: git
  154. diff --git a/spec/acceptance/nodesets/nodepool-centos7.yml b/spec/acceptance/nodesets/nodepool-centos7.yml
  155. index 575ae67..c552874 100644
  156. --- a/spec/acceptance/nodesets/nodepool-centos7.yml
  157. +++ b/spec/acceptance/nodesets/nodepool-centos7.yml
  158. @@ -3,7 +3,7 @@ HOSTS:
  159. roles:
  160. - master
  161. platform: el-7-x86_64
  162. - hypervisor : none
  163. + hypervisor: none
  164. ip: 127.0.0.1
  165. CONFIG:
  166. type: foss
  167. diff --git a/spec/acceptance/nodesets/nodepool-trusty.yml b/spec/acceptance/nodesets/nodepool-trusty.yml
  168. index a95d9f3..7f503ca 100644
  169. --- a/spec/acceptance/nodesets/nodepool-trusty.yml
  170. +++ b/spec/acceptance/nodesets/nodepool-trusty.yml
  171. @@ -1,9 +1,9 @@
  172. HOSTS:
  173. - ubuntu-14.04-amd64:
  174. + ubuntu-1404-x64:
  175. roles:
  176. - master
  177. platform: ubuntu-14.04-amd64
  178. - hypervisor : none
  179. + hypervisor: none
  180. ip: 127.0.0.1
  181. CONFIG:
  182. type: foss
  183. diff --git a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
  184. index cba1cd0..3bb3e62 100644
  185. --- a/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
  186. +++ b/spec/acceptance/nodesets/ubuntu-server-1404-x64.yml
  187. @@ -3,9 +3,9 @@ HOSTS:
  188. roles:
  189. - master
  190. platform: ubuntu-14.04-amd64
  191. - box : puppetlabs/ubuntu-14.04-64-nocm
  192. - box_url : https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
  193. - hypervisor : vagrant
  194. + box: puppetlabs/ubuntu-14.04-64-nocm
  195. + box_url: https://vagrantcloud.com/puppetlabs/ubuntu-14.04-64-nocm
  196. + hypervisor: vagrant
  197. CONFIG:
  198. - log_level : debug
  199. + log_level: debug
  200. type: git
  201. diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
  202. index 172614e..3df4ced 100644
  203. --- a/spec/spec_helper.rb
  204. +++ b/spec/spec_helper.rb
  205. @@ -1,5 +1,6 @@
  206. require 'puppetlabs_spec_helper/module_spec_helper'
  207. require 'shared_examples'
  208. +require 'webmock/rspec'
  209.  
  210. RSpec.configure do |c|
  211. c.alias_it_should_behave_like_to :it_configures, 'configures'
  212. Files added:
  213. spec/acceptance/nodesets/centos-70-x64.yml
  214.  
  215.  
  216. --------------------------------
  217. [pabelanger@localhost puppet-modulesync-configs]$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!