diff --git a/.sync.yml b/.sync.yml index c15a0ccbb..aa41efef7 100644 --- a/.sync.yml +++ b/.sync.yml @@ -9,8 +9,6 @@ spec/spec_helper.rb: spec_overrides: - "require 'support/acceptance/supported_versions'" - "require 'spec_helper_methods'" -spec/spec_helper_acceptance.rb: - unmanaged: false .github/workflows/ci.yml: pidfile_workaround: CentOS,Ubuntu .puppet-lint.rc: diff --git a/spec/spec_helper_acceptance.rb b/spec/spec_helper_acceptance.rb index d3a6e23cf..d64c527b1 100644 --- a/spec/spec_helper_acceptance.rb +++ b/spec/spec_helper_acceptance.rb @@ -1,10 +1,14 @@ # frozen_string_literal: true -# Managed by modulesync - DO NOT EDIT -# https://voxpupuli.org/docs/updating-files-managed-with-modulesync/ - require 'voxpupuli/acceptance/spec_helper_acceptance' -configure_beaker +configure_beaker do + # In Puppet 7 the locale ends up being C.UTF-8 if it isn't passed. + # This locale doesn't exist in EL7 and won't be supported either. + # At least PostgreSQL runs into this. + if host['hypervisor'] == 'docker' && host['platform'] == 'el-7-x86_64' + ENV['LANG'] = 'en_US.UTF-8' + end +end Dir['./spec/support/acceptance/**/*.rb'].sort.each { |f| require f }