wip

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>

Rakefile

@@ -12,21 +12,21 @@ end
 
 PuppetLint::RakeTask.new :lint do |config|
   config.disable_checks = ['80chars',
-                           'class_parameter_defaults',
-                           'names_containing_dash']
+    'class_parameter_defaults',
+    'names_containing_dash']
   config.pattern = 'dist/**/*.pp'
   config.fail_on_warnings = true
 end
 
 desc 'Resolve all the dependencies'
 task :resolve do
-  # for reasons beyond me, we list dependencies in Puppetfile and .fixtures.yml
-  # we need to keep them in sync, and when we change them we need to run two commands
-  # to reflect those changes
+  # Cleanup
+  `rm -rf ./modules/ .fixtures.yml`
 
-  # this fills ./modules
-  `rm -rf ./modules/*`
-  `r10k puppetfile install`
+  # Generate the test fixtures from the Puppetfile and install them in ./spec/fixtures/ (modules, symlinks, etc.)
+  `generate-puppetfile -p ./Puppetfile --fixtures-only --ignore-comments`
+  # Remove jenkins_keys as it is a private repository
+  `yq --inplace 'del(.fixtures.repositories.jenkins_keys)' .fixtures.yml # Remove jenkins_keys as it is a private repository`
 
   # this fills ./spec/fixtures/modules
   Rake::Task['spec_clean'].invoke

ci/00_setupgems.sh

@@ -9,9 +9,5 @@ bundle -v
 mkdir -p vendor/gems
 bundle install --without development plugins --path=vendor/gems
 
-# Generate fixtures for unit tests from the Puppetfile (production Puppet modules)
-bundle exec generate-puppetfile -p ./Puppetfile --fixtures-only --ignore-comments
-yq --inplace 'del(.fixtures.repositories.jenkins_keys)' .fixtures.yml # Remove jenkins_keys as it is a private repository
-
-# Generate Test Fixtures
-bundle exec rake spec_clean spec_prep
+# Resolve Test Fixtures and Puppet modules
+bundle exec rake resolve