diff --git a/.github/actions/presuite.rb b/.github/actions/presuite.rb index 9399a2c14e..aa866241cd 100644 --- a/.github/actions/presuite.rb +++ b/.github/actions/presuite.rb @@ -1,4 +1,5 @@ require 'open3' +require 'fileutils' def install_bundler message('INSTALL BUNDLER') @@ -74,8 +75,10 @@ def update_facter_lib facter_lib_path = (HOST_PLATFORM.include? 'windows') ? facter_lib_windows_path : facter_lib_linux_path message('OVERWRITE FACTER FILES') - run("rm -rf #{facter_lib_path} #{facter_lib_path + '.rb'}") - run("mv #{File.join(pr_facter_lib_path)} #{facter_lib_path.sub('facter', '')}") + puts FileUtils.rm_r([facter_lib_path, facter_lib_path + '.rb'], force: true) + puts run('pwd') + puts run('ls ..') + run("move \'..\\lib\\*\' \'#{facter_lib_path.sub('facter', '')}\'") end def run_acceptance_tests diff --git a/facter.conf b/facter.conf index 23bc1ade88..1287aa007d 100644 --- a/facter.conf +++ b/facter.conf @@ -1,25 +1,3 @@ facts : { - blocklist : [ "file system", "EC2", "os.name" ], - ttls : [ - { "timezone" : 30 days }, - ] -} -global : { - external-dir : [ "./external_facts"], - custom-dir : [ "./custom-facts", "./custom-facts2" ], - no-external-facts : false, - no-custom-facts : false, - no-ruby : false - show-legacy : false -} - -cli : { - debug : false, - trace : true, - verbose : false, - log-level : "warn" -} - -fact-groups : { - cached-custom-facts : ["my_custom_fact"], + blocklist : [ "my_custom_fact" ] } \ No newline at end of file