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

Update dependencies #539

Merged
merged 3 commits into from
Dec 20, 2021
Merged

Update dependencies #539

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
a5c99a4
Update kmod module
sazzle2611 Dec 14, 2021
7ae4029
Update dependency versions
sazzle2611 Dec 14, 2021
6234c25
Fix ruby tests for kmod module update
sazzle2611 Dec 15, 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
2 changes: 1 addition & 1 deletion .fixtures.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ fixtures:
archive: "puppet-archive"
augeasproviders_sysctl: "herculesteam-augeasproviders_sysctl"
augeasproviders_core: "herculesteam-augeasproviders_core"
kmod: "camptocamp-kmod"
kmod: "puppet-kmod"
helm: 'puppetlabs-helm'
rook: 'puppetlabs-rook'
repositories:
Expand Down
10 changes: 5 additions & 5 deletions metadata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,27 +10,27 @@
"dependencies": [
{
"name": "puppetlabs-stdlib",
"version_requirement": ">= 4.20.0 < 8.0.0"
"version_requirement": ">= 4.20.0 < 9.0.0"
},
{
"name": "puppetlabs-apt",
"version_requirement": "< 9.0.0"
},
{
"name": "puppet-archive",
"version_requirement": ">= 2.0.0 < 5.0.0"
"version_requirement": ">= 2.0.0 < 7.0.0"
},
{
"name": "herculesteam-augeasproviders_sysctl",
"version_requirement": ">= 2.2.1 < 3.0.0"
},
{
"name": "herculesteam-augeasproviders_core",
"version_requirement": ">= 2.1.0 < 3.0.0"
"version_requirement": ">= 2.1.0 < 4.0.0"
},
{
"name": "camptocamp-kmod",
"version_requirement": ">= 2.2.0 < 3.0.0"
"name": "puppet-kmod",
"version_requirement": ">= 2.2.0 < 4.0.0"
}
],
"operatingsystem_support": [
Expand Down
18 changes: 9 additions & 9 deletions spec/classes/packages_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
context 'with osfamily => RedHat and container_runtime => Docker and manage_docker => true and manage_etcd => true' do
let(:facts) do
{
:osfamily => 'RedHat', #needed to run dependent tests from fixtures camptocamp-kmod
:osfamily => 'RedHat', #needed to run dependent tests from fixtures puppet-kmod
:kernel => 'Linux',
:os => {
:family => "RedHat",
Expand Down Expand Up @@ -110,7 +110,7 @@
context 'with osfamily => RedHat and container_runtime => Docker and manage_docker => true and manage_etcd => true and etcd_install_method => package' do
let(:facts) do
{
:osfamily => 'RedHat', #needed to run dependent tests from fixtures camptocamp-kmod
:osfamily => 'RedHat', #needed to run dependent tests from fixtures puppet-kmod
:kernel => 'Linux',
:os => {
:family => "RedHat",
Expand Down Expand Up @@ -209,7 +209,7 @@
context 'with osfamily => RedHat and container_runtime => cri_containerd and containerd_install_method => package and manage_etcd => true' do
let(:facts) do
{
:osfamily => 'RedHat', #needed to run dependent tests from fixtures camptocamp-kmod
:osfamily => 'RedHat', #needed to run dependent tests from fixtures puppet-kmod
:kernel => 'Linux',
:os => {
:family => "RedHat",
Expand Down Expand Up @@ -374,7 +374,7 @@
context 'with osfamily => RedHat and container_runtime => cri_containerd and containerd_install_method => package and containerd_default_runtime_name => nvidia and manage_etcd => true' do
let(:facts) do
{
:osfamily => 'RedHat', #needed to run dependent tests from fixtures camptocamp-kmod
:osfamily => 'RedHat', #needed to run dependent tests from fixtures puppet-kmod
:kernel => 'Linux',
:os => {
:family => "RedHat",
Expand Down Expand Up @@ -452,7 +452,7 @@
context 'with osfamily => Debian and container_runtime => cri_containerd and manage_etcd => false' do
let(:facts) do
{
:osfamily => 'Debian', #needed to run dependent tests from fixtures camptocamp-kmod
:osfamily => 'Debian', #needed to run dependent tests from fixtures puppet-kmod
:kernel => 'Linux',
:os => {
:family => "Debian",
Expand Down Expand Up @@ -548,7 +548,7 @@
context 'with osfamily => Debian and container_runtime => Docker and manage_docker => true and manage_etcd => true' do
let(:facts) do
{
:osfamily => 'Debian', #needed to run dependent tests from fixtures camptocamp-kmod
:osfamily => 'Debian', #needed to run dependent tests from fixtures puppet-kmod
:kernel => 'Linux',
:os => {
:family => "Debian",
Expand Down Expand Up @@ -647,7 +647,7 @@
context 'with osfamily => Debian and container_runtime => Docker and manage_docker => false and manage_etcd => true' do
let(:facts) do
{
:osfamily => 'Debian', #needed to run dependent tests from fixtures camptocamp-kmod
:osfamily => 'Debian', #needed to run dependent tests from fixtures puppet-kmod
:kernel => 'Linux',
:os => {
:family => "Debian",
Expand Down Expand Up @@ -741,7 +741,7 @@
context 'with osfamily => Debian and container_runtime => cri_containerd and containerd_install_method => package and manage_etcd => true' do
let(:facts) do
{
:osfamily => 'Debian', #needed to run dependent tests from fixtures camptocamp-kmod
:osfamily => 'Debian', #needed to run dependent tests from fixtures puppet-kmod
:kernel => 'Linux',
:os => {
:family => "Debian",
Expand Down Expand Up @@ -835,7 +835,7 @@
context 'with disable_swap => true' do
let(:facts) do
{
:osfamily => 'Debian', #needed to run dependent tests from fixtures camptocamp-kmod
:osfamily => 'Debian', #needed to run dependent tests from fixtures puppet-kmod
:kernel => 'Linux',
:os => {
:family => "Debian",
Expand Down
2 changes: 1 addition & 1 deletion spec/spec_helper_acceptance_local.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def execute_agent(role)
run_shell('puppet module install puppet-archive')
run_shell('puppet module install herculesteam-augeasproviders_sysctl')
run_shell('puppet module install herculesteam-augeasproviders_core')
run_shell('puppet module install camptocamp-kmod')
run_shell('puppet module install puppet-kmod')
run_shell('puppet module install puppetlabs-docker')
run_shell('puppet module install puppetlabs-helm')
run_shell('puppet module install puppetlabs-rook --ignore-dependencies')
Expand Down