Skip to content

Commit

Permalink
Merge pull request #67 from ekohl/update-os
Browse files Browse the repository at this point in the history
Drop EL6 and Ubuntu 18.04, add Ubuntu 18.04 & Debian 10
  • Loading branch information
ekohl committed Feb 15, 2021
2 parents a13ed08 + f089e8b commit f31f1b1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 10 deletions.
6 changes: 3 additions & 3 deletions .fixtures.yml
@@ -1,8 +1,8 @@
fixtures:
repositories:
ssh: "git://github.com/saz/puppet-ssh.git"
stdlib: "git://github.com/puppetlabs/puppetlabs-stdlib.git"
concat: "git://github.com/puppetlabs/puppetlabs-concat.git"
ssh: "https://github.com/saz/puppet-ssh.git"
stdlib: "https://github.com/puppetlabs/puppetlabs-stdlib.git"
concat: "https://github.com/puppetlabs/puppetlabs-concat.git"
sshkeys_core:
repo: https://github.com/puppetlabs/puppetlabs-sshkeys_core.git
puppet_version: ">= 6.0.0"
10 changes: 7 additions & 3 deletions metadata.json
Expand Up @@ -27,21 +27,25 @@
{
"operatingsystem": "RedHat",
"operatingsystemrelease": [
"6",
"7"
]
},
{
"operatingsystem": "CentOS",
"operatingsystemrelease": [
"6",
"7"
]
},
{
"operatingsystem": "Debian",
"operatingsystemrelease": [
"10"
]
},
{
"operatingsystem": "Ubuntu",
"operatingsystemrelease": [
"14.04"
"18.04"
]
}
]
Expand Down
3 changes: 1 addition & 2 deletions spec/defines/sftp_jail_jail_spec.rb
@@ -1,8 +1,7 @@
require 'spec_helper'

describe 'sftp_jail::jail' do
# We need Facter 3 facts - it breaks with version 2
on_supported_os(facterversion: '3.0.0').each do |os, facts|
on_supported_os.each do |os, facts|
context "on #{os}" do
let :facts do
facts
Expand Down
3 changes: 1 addition & 2 deletions spec/defines/sftp_jail_user_spec.rb
Expand Up @@ -13,8 +13,7 @@
}
end

# We need Facter 3 facts - it breaks with version 2
on_supported_os(facterversion: '3.0.0').each do |os, facts|
on_supported_os.each do |os, facts|
context "on #{os}" do
let :facts do
facts
Expand Down

0 comments on commit f31f1b1

Please sign in to comment.