From 3d23e05f11ce913d748174c3cac0aa817c0fbff1 Mon Sep 17 00:00:00 2001
From: Andrei Filipovici
 <andrei.filipovici@andreis-mbp.eth.tsr.corp.puppet.net>
Date: Tue, 28 Apr 2020 19:47:58 +0300
Subject: [PATCH] (FACT-2569) changed ruby setup

---
 .github/actions/presuite.sh | 23 ++++++++++++-----------
 .github/workflows/ci.yml    | 10 +++++++---
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/.github/actions/presuite.sh b/.github/actions/presuite.sh
index 17c70c7eb..492755008 100755
--- a/.github/actions/presuite.sh
+++ b/.github/actions/presuite.sh
@@ -1,21 +1,22 @@
 #!/bin/sh -x
 
 export DEBIAN_DISABLE_RUBYGEMS_INTEGRATION=no_wornings
-export DENABLE_PATH_CHECK=0
 export PATH=/opt/puppetlabs/puppet/bin/:/opt/puppetlabs/bin:$PATH
 cwd=$(pwd)
 
 printf '\nInstall bundler\n\n'
 gem install bundler
 
-printf '\nInstall facter 3 dependencies\n\n'
+printf '\nInstall facter 4 dependencies\n\n'
+cd $cwd/$FACTER_4_ROOT && bundle install
+
+printf '\nInstall facter 3 acceptance dependencies\n\n'
 cd $cwd/$FACTER_3_ROOT/acceptance && bundle install
 
 printf '\nInstall custom beaker\n\n'
 cd $cwd/$BEAKER_ROOT
 gem build beaker.gemspec
 gem install beaker-*.gem --bindir /bin
-bundle info beaker --path
 
 printf '\nBeaker provision\n\n'
 cd $cwd/$FACTER_3_ROOT/acceptance
@@ -29,15 +30,15 @@ beaker exec pre-suite --pre-suite $BP_ROOT/setup/aio/010_Install_Puppet_Agent.rb
 printf '\nConfigure facter 4 as facter 3\n\n'
 puppet config set facterng true
 
-printf '\nInstall facter 4 dependencies\n\n'
-cd $cwd/$FACTER_4_ROOT && bundle install
+agent_facter_ng_version=`facter-ng --version | tr -d '\r'`
+
+cp -r $cwd/$FACTER_4_ROOT/* /opt/puppetlabs/puppet/lib/ruby/gems/2.5.0/gems/facter-ng-$agent_facter_ng_version/
+mv /opt/puppetlabs/puppet/bin/facter-ng /opt/puppetlabs/bin/facter
 
-printf '\nInstall facter 4\n\n'
-gem build facter.gemspec
-gem install -f facter-*.gem
+puts facter -version
+puts puppet facts | grep facterversion
 
 printf '\nBeaker tests\n\n'
 cd $cwd/$FACTER_3_ROOT/acceptance
-
-beaker exec tests/external_facts/external_fact_stderr_messages_output_to_stderr.rb --test-tag-exclude=server,facter_3 --test-tag-or=risk:high,audit:high
-echo $PATH
+beaker exec tests --test-tag-exclude=server,facter_3 --test-tag-or=risk:high,audit:high 2>&1 | tee results.txt
+sed -n '/Failed Tests Cases:/,/Skipped Tests Cases:/p' results.txt | grep 'Test Case' | awk {'print $3'}
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cf8101374..d9f693df6 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,7 @@ jobs:
         uses: actions/checkout@v2
         with:
           repository: puppetlabs/facter
-          ref: master
+          ref: run_tests_on_ng
           path: facter_3
 
       - name: Clone Mihai's beaker fork
@@ -34,10 +34,14 @@ jobs:
           path: beaker
 
       - name: Install Ruby 2.6
-        uses: actions/setup-ruby@v1
+        uses: ruby/setup-ruby@v1
         with:
           ruby-version: '2.6'
 
+      - name: Fix permissions
+        run: |
+          sudo chmod a-w /home/runner /opt /usr/share
+          sudo chmod -R a-w /usr/share/rust
+
       - name: Run acceptance tests
         run: sudo -E bash -c facter_4/.github/actions/presuite.sh
-