Merge pull request #2646 from mhashizume/FACT-3448/main/skip-amazon-r…

…elease-minor (FACT-3448) Skip minor OS version fact for Amazon
puppetlabs · Nov 22, 2023 · f8a2f0a · f8a2f0a
2 parents 3c39454 + eaa2bd0
commit f8a2f0a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/acceptance/lib/facter/acceptance/base_fact_utils.rb b/acceptance/lib/facter/acceptance/base_fact_utils.rb
@@ -179,7 +179,9 @@ def el_expected_facts(agent)
           expected_facts['os.distro.id'] = os_distro_id
           expected_facts['os.distro.release.full'] = os_distro_release_full
           expected_facts['os.distro.release.major'] = os_version
-          expected_facts['os.distro.release.minor'] = /\d/ if os_version != '2' # Amazon Linux 2
+          # Minor versions are not available in Amazon Linux < 2023 and has not
+          # yet been implemented in Facter for >= 2023
+          expected_facts['os.distro.release.minor'] = /\d/ unless os_name = 'Amazon'
           expected_facts['os.family'] = 'RedHat'
           expected_facts['os.hardware'] = os_hardware
           expected_facts['os.name'] = os_name