Merge pull request #539 from sazzle2611/dependencies

Update dependencies
puppetlabs · Dec 20, 2021 · ec40b21 · ec40b21
2 parents d207df8 + 6234c25
commit ec40b21
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 16 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -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:

diff --git a/metadata.json b/metadata.json
@@ -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": [

diff --git a/spec/classes/packages_spec.rb b/spec/classes/packages_spec.rb
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",
@@ -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",

diff --git a/spec/spec_helper_acceptance_local.rb b/spec/spec_helper_acceptance_local.rb
@@ -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')