(PDK-1200) Validate should honor testing from source

puppetlabs · Oct 30, 2018 · cdbf095 · cdbf095
1 parent 2ae1dba
commit cdbf095
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git a/lib/pdk/cli/validate.rb b/lib/pdk/cli/validate.rb
@@ -91,6 +91,9 @@ module PDK::CLI
       puppet_env = PDK::CLI::Util.puppet_from_opts_or_env(opts)
       PDK::Util::PuppetVersion.fetch_puppet_dev if opts.key?(:'puppet-dev')
       PDK::Util::RubyVersion.use(puppet_env[:ruby_version])
+
+      options.merge!(puppet_env[:gemset])
+
       PDK::Util::Bundler.ensure_bundle!(puppet_env[:gemset])
 
       exit_code = 0

diff --git a/lib/pdk/validate/base_validator.rb b/lib/pdk/validate/base_validator.rb
@@ -141,6 +141,7 @@ def self.invoke(report, options = {})
 
           command = PDK::CLI::Exec::Command.new(*cmd_argv).tap do |c|
             c.context = :module
+            c.environment = { 'PUPPET_GEM_VERSION' => options[:puppet] } if options[:puppet]
             unless options[:split_exec]
               exec_group = options[:exec_group]
               if exec_group