Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Allow stdlib 8.0.0 #221

Merged
merged 3 commits into from
Aug 26, 2021
Merged

Allow stdlib 8.0.0 #221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
adba62c
Allow stdlib 8.0.0
smortex Aug 25, 2021
2554b6e
Pet puppet-lint
smortex Aug 25, 2021
e3f9a99
Fix CI
smortex Aug 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 0 additions & 12 deletions data/os/RedHat/AlmaLinux.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ yum::repos:
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
target: '/etc/yum.repos.d/almalinux.repo'
fastestmirror: true

appstream:
enabled: true
Expand All @@ -32,7 +31,6 @@ yum::repos:
gpgcheck: true
gpgkey: "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux"
target: '/etc/yum.repos.d/almalinux.repo'
fastestmirror: true

powertools:
descr: 'AlmaLinux $releasever - PowerTools'
Expand All @@ -41,7 +39,6 @@ yum::repos:
enabled: true
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true

extras:
name: 'AlmaLinux $releasever - Extras'
Expand All @@ -50,7 +47,6 @@ yum::repos:
enabled: true
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true

baseos-source:
name: 'AlmaLinux $releasever - BaseOS Source'
Expand All @@ -59,7 +55,6 @@ yum::repos:
enabled: false
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true

appstream-source:
name: 'AlmaLinux $releasever - AppStream Source'
Expand All @@ -68,7 +63,6 @@ yum::repos:
enabled: false
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true

powertools-source:
name: 'AlmaLinux $releasever - PowerTools Source'
Expand All @@ -77,7 +71,6 @@ yum::repos:
enabled: false
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true

extras-source:
name: 'AlmaLinux $releasever - Extras Source'
Expand All @@ -86,7 +79,6 @@ yum::repos:
enabled: false
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true

baseos-debuginfo:
name: 'AlmaLinux $releasever - BaseOS debuginfo'
Expand All @@ -95,7 +87,6 @@ yum::repos:
enabled: false
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true

appstream-debuginfo:
name: 'AlmaLinux $releasever - AppStream debuginfo'
Expand All @@ -104,7 +95,6 @@ yum::repos:
enabled: false
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true

powertools-debuginfo:
name: 'AlmaLinux $releasever - PowerTools debuginfo'
Expand All @@ -113,7 +103,6 @@ yum::repos:
enabled: false
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true

extras-debuginfo:
name: 'AlmaLinux $releasever - Extras debuginfo'
Expand All @@ -122,4 +111,3 @@ yum::repos:
enabled: false
gpgcheck: true
gpgkey: 'file:///etc/pki/rpm-gpg/RPM-GPG-KEY-AlmaLinux'
fastestmirror: true
2 changes: 1 addition & 1 deletion manifests/init.pp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@
Boolean $clean_old_kernels = true,
Boolean $keep_kernel_devel = false,
Hash[String, Variant[String, Integer, Boolean, Hash[String, Variant[String, Integer, Boolean]]]] $config_options = {},
Optional[Hash[String, Optional[Hash[String, Variant[String, Integer, Boolean]]]]] $repos = {},
Hash[String, Optional[Hash[String, Variant[String, Integer, Boolean]]]] $repos = {},
Array[String] $managed_repos = [],
Boolean $manage_os_default_repos = false,
Array[String] $os_default_repos = [],
Expand Down
2 changes: 1 addition & 1 deletion metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
"dependencies": [
{
"name": "puppetlabs/stdlib",
"version_requirement": ">= 4.18.0 < 8.0.0"
"version_requirement": ">= 4.18.0 < 9.0.0"
},
{
"name": "puppetlabs/concat",
Expand Down
22 changes: 22 additions & 0 deletions spec/classes/init_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -308,6 +308,28 @@
'extras-debuginfo',
]
end
when 'Rocky'
case facts[:os]['release']['major']
when '8'
it { is_expected.to have_yumrepo_resource_count(15) }
it_behaves_like 'a catalog containing repos', [
'appstream',
'appstream-source',
'baseos',
'baseos-source',
'devel',
'extras',
'ha',
'ha-source',
'nfv',
'plus',
'powertools',
'powertools-source',
'resilient-storage',
'resilient-storage-source',
'rt',
]
end
else
it { is_expected.to have_yumrepo_resource_count(0) }
end
Expand Down