Skip to content

Commit

Permalink
Add workaround for EL 7 locale
Browse files Browse the repository at this point in the history
  • Loading branch information
ekohl committed Aug 24, 2022
1 parent 269eb38 commit 63dcee8
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 6 deletions.
2 changes: 0 additions & 2 deletions .sync.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 8 additions & 4 deletions spec/spec_helper_acceptance.rb
Original file line number Diff line number Diff line change
@@ -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 }

0 comments on commit 63dcee8

Please sign in to comment.