Merge master to windows #60

ferventcoder · 2016-04-19T18:20:25Z

This merges all the changes from master to Windows in preparation for combining the branches.

Consistently use 'bundle exec' in examples of executing tests.

Puppet 4 shipped with ruby 2.1.6 in puppet-agent 1.0.1, so we should test with that. Also test strict variables. Not a failing test yet.

Add puppet 4

Add the ability to allow failures

…pdate_docs (MODULES-1885) update docs

Add puppet install helper

Add tagmail to the managed modules

Gemfile: recognize ssh urls for git

* run rake once with all the targets instead of spawning it thrice * enforce unit test on puppet 4 * add the metadata-json-lint gem to enable this validation

(maint) several fixes to the default config

These can still be overridden by setting SPEC_OPTS or on the commandline, if required.

(maint) reactivate default rspec options

git should ignore the log folder

…_motd (FM-3923) Add puppetlabs-motd module to modulesync

(maint) Use blacksmith for promotions

…her lists

…en-possible (maint) use newer rspec when possible

…g template

Add spec helper local and travisci caching

This uses travis to run a preliminary evaluation of PRs using the spec/acceptance test suites running in a docker container on a VM-based travis runner. This allows us to evaluate the effects of a change before merging it.

Docker acceptance on travis

ferventcoder · 2016-04-19T18:23:22Z

@puppetlabs/windows and @glennsarti especially - feast your eyes on this awesome sauce. Please review.

Thanks @DavidS !

ferventcoder · 2016-04-19T18:25:39Z

moduleroot/.gitattributes

+*.rb  eol=lf
+*.erb eol=lf
+*.pp  eol=lf
+*.sh  eol=lf


Noooo..... haha

Looks like this is causing issues with one of our modules. Looks like we'll need to fix that one up.

* master: (30 commits) (FM-5091) Implement docker-based full-system tests Refresh the default vagrant nodesets Ignore transient files from bundler Add a paragraph about adding a module to here Add simple travis check Remove editor specific formatting comment Add Apache-2.0 LICENSE file. add do not edit header to files Address pull request comments (maint) use proper env var for beaker-hostgenerator version (maint) Refactor Gemfile (maint) Use beaker-hostgenerator to create nodesets Require a fixed version of rspec-puppet Remove support for testing on ruby 1.8 Add facility for spec_helper to include local content without breaking template enable caching of gem bundles on travisci (maint) re-order travis.yml to run new versions first; alphabetise other lists (BKR-537) use a working rspec-core version depending on current ruby (maint) Use blacksmith for promotions (FM-3923) Add puppetlabs-motd module to modulesync ...

ferventcoder · 2016-04-19T21:13:29Z

Now it is failing on the chocolatey module

Syncing puppetlabs-chocolatey
Cloning repository fresh
Cloning from https://github.com/puppetlabs/puppetlabs-chocolatey.git
Not managing Rakefile in puppetlabs-chocolatey
Not managing spec/spec_helper.rb in puppetlabs-chocolatey
Using no-op. Files in puppetlabs-chocolatey may be changed but will not be committed.
Files changed: 
/home/travis/build/puppetlabs/modulesync_configs/vendor/bundle/ruby/1.9.1/gems/git-1.3.0/lib/git/diff.rb:151:in `block in process_full_diff': undefined method `[]' for nil:NilClass (NoMethodError)
    from /home/travis/build/puppetlabs/modulesync_configs/vendor/bundle/ruby/1.9.1/gems/git-1.3.0/lib/git/diff.rb:134:in `each'
    from /home/travis/build/puppetlabs/modulesync_configs/vendor/bundle/ruby/1.9.1/gems/git-1.3.0/lib/git/diff.rb:134:in `process_full_diff'

DavidS · 2016-04-20T14:46:16Z

I added debugging to the git gem around the failing line and this is the git diff output it's stumbling over:

warning: CRLF will be replaced by LF in examples/init.pp.

ferventcoder · 2016-04-20T20:05:57Z

That means it's the gitattributes - have I ever mentioned how much I dislike gitattributes?

DavidS · 2016-04-21T13:32:01Z

An ugly situation to a terrible problem. Maybe we should also add a check to puppet-lint or similar, so that all those files are unix line-endings only?

ferventcoder · 2016-04-22T20:55:15Z

@DavidS sounds good. Enjoy your vacay

DavidS · 2016-07-20T09:16:03Z

@ferventcoder what does it need to get traction on this again? Should we regroup and start by merging easier subsets, or do you just need a bit of quality time scheduled to make this happen?

ferventcoder · 2016-07-24T16:49:44Z

Quality time likely.

DavidS · 2016-07-25T09:21:22Z

Ticket writing as a Service: https://tickets.puppetlabs.com/browse/MODULES-3631

hunner · 2016-11-02T16:08:31Z

I'd be happy to pitch in as well.

tphoney · 2017-09-22T10:54:53Z

@hunner can this be closed, it seems a tad out of date

pmcmaw · 2017-11-27T10:25:53Z

Closing this PR as it seems to be out of date.

spil-jaak and others added 30 commits March 24, 2015 09:23

(MODULES-1885) update docs

6f396d5

Consistently use 'bundle exec' in examples of executing tests.

Add puppet 4

2d4016a

Puppet 4 shipped with ruby 2.1.6 in puppet-agent 1.0.1, so we should test with that. Also test strict variables. Not a failing test yet.

Merge pull request puppetlabs#21 from puppetlabs/add_4

6a6059c

Add puppet 4

Add the ability to allow failures

90b406f

Merge pull request puppetlabs#23 from puppetlabs/add_failures

4d577a2

Add the ability to allow failures

Merge pull request puppetlabs#16 from spil-jaak/ticket/MODULES-1885-u…

1b76663

…pdate_docs (MODULES-1885) update docs

Add puppet install helper

a19e0b8

Merge pull request puppetlabs#24 from puppetlabs/add_helper

e3d439f

Add puppet install helper

Gemfile: recognize ssh urls for git

59d877e

Add tagmail to the managed modules

0dff755

Merge pull request puppetlabs#26 from DavidS/add-tagmail-module

36dd3cb

Add tagmail to the managed modules

Merge pull request puppetlabs#25 from DavidS/enable-git-ssh-urls

1a7a582

Gemfile: recognize ssh urls for git

(maint) several fixes to the default config

4ea331a

* run rake once with all the targets instead of spawning it thrice * enforce unit test on puppet 4 * add the metadata-json-lint gem to enable this validation

Merge pull request puppetlabs#31 from DavidS/update-default-configs

5cb56e2

(maint) several fixes to the default config

(maint) reactivate default rspec options

9ebe22e

These can still be overridden by setting SPEC_OPTS or on the commandline, if required.

Merge pull request puppetlabs#36 from DavidS/fix-rspec-opts

175de44

(maint) reactivate default rspec options

git should ignore the log folder

24d09a8

Merge pull request puppetlabs#38 from tphoney/ignore_log_folder

2a48043

git should ignore the log folder

WIP include .gitattributes file

be7ccb0

(FM-3923) Add puppetlabs-motd module to modulesync

cce06dc

Merge pull request puppetlabs#40 from phongdly/FM-3923/modulesync_for…

14296e4

…_motd (FM-3923) Add puppetlabs-motd module to modulesync

(maint) Use blacksmith for promotions

1bb8777

Merge pull request puppetlabs#41 from justinstoller/use-blacksmith

7edd271

(maint) Use blacksmith for promotions

(BKR-537) use a working rspec-core version depending on current ruby

0415fc1

(maint) re-order travis.yml to run new versions first; alphabetise ot…

44bf81f

…her lists

Merge pull request puppetlabs#43 from DavidS/maint-use-newer-rspec-wh…

586f659

…en-possible (maint) use newer rspec when possible

enable caching of gem bundles on travisci

7357bb2

Add facility for spec_helper to include local content without breakin…

7316ae8

…g template

Merge pull request puppetlabs#44 from DavidS/add-spec_helper_local

b494132

Add spec helper local and travisci caching

Remove support for testing on ruby 1.8

b08a84e

DavidS and others added 3 commits April 13, 2016 20:37

Refresh the default vagrant nodesets

32e1b9e

(FM-5091) Implement docker-based full-system tests

9ca280f

This uses travis to run a preliminary evaluation of PRs using the spec/acceptance test suites running in a docker container on a VM-based travis runner. This allows us to evaluate the effects of a change before merging it.

Merge pull request puppetlabs#58 from DavidS/docker-acceptance-on-travis

2d58989

Docker acceptance on travis

ferventcoder reviewed Apr 19, 2016
View reviewed changes

ferventcoder force-pushed the windows branch from c24d1e2 to 33c8f91 Compare April 19, 2016 18:44

glennsarti mentioned this pull request Apr 29, 2016

(FM-5165) Add MAINTAINERS.md file to all modules #64

Closed

ferventcoder mentioned this pull request Apr 29, 2016

(maint) Update modsync root files after audit #66

Merged

hunner mentioned this pull request Oct 19, 2016

(MODULES-3704) Update gemfile template like windows #94

Merged

hunner mentioned this pull request Jan 25, 2017

Mergeback Windows #127

Closed

pmcmaw closed this Nov 27, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge master to windows #60

Merge master to windows #60

ferventcoder commented Apr 19, 2016

ferventcoder commented Apr 19, 2016

ferventcoder Apr 19, 2016

DavidS Apr 19, 2016

ferventcoder Apr 20, 2016

ferventcoder commented Apr 19, 2016

DavidS commented Apr 20, 2016

ferventcoder commented Apr 20, 2016

DavidS commented Apr 21, 2016

ferventcoder commented Apr 22, 2016

DavidS commented Jul 20, 2016

ferventcoder commented Jul 24, 2016

DavidS commented Jul 25, 2016

hunner commented Nov 2, 2016

tphoney commented Sep 22, 2017

pmcmaw commented Nov 27, 2017

Merge master to windows #60

Merge master to windows #60

Conversation

ferventcoder commented Apr 19, 2016

ferventcoder commented Apr 19, 2016

ferventcoder Apr 19, 2016

Choose a reason for hiding this comment

DavidS Apr 19, 2016

Choose a reason for hiding this comment

ferventcoder Apr 20, 2016

Choose a reason for hiding this comment

ferventcoder commented Apr 19, 2016

DavidS commented Apr 20, 2016

ferventcoder commented Apr 20, 2016

DavidS commented Apr 21, 2016

ferventcoder commented Apr 22, 2016

DavidS commented Jul 20, 2016

ferventcoder commented Jul 24, 2016

DavidS commented Jul 25, 2016

hunner commented Nov 2, 2016

tphoney commented Sep 22, 2017

pmcmaw commented Nov 27, 2017