allow newer puppetlabs-apt versions

voxpupuli · Sep 2, 2017 · 0fc1429 · 0fc1429
1 parent e8b57bf
commit 0fc1429
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 7 deletions.
diff --git a/.fixtures.yml b/.fixtures.yml
@@ -2,7 +2,7 @@ fixtures:
   repositories:
     apt:
       repo: "https://github.com/puppetlabs/puppetlabs-apt"
-      ref: "2.1.0"
+      ref: "4.1.0"
     stdlib:
       repo: "https://github.com/puppetlabs/puppetlabs-stdlib"
       ref: "4.18.0"

diff --git a/.gitignore b/.gitignore
@@ -2,6 +2,7 @@
 .bundle
 doc/
 Gemfile.lock
+.idea
 log/
 pkg/*
 .project

diff --git a/metadata.json b/metadata.json
@@ -20,7 +20,7 @@
    ],
   "dependencies": [
     { "name": "puppetlabs/stdlib", "version_requirement": ">= 4.18.0 < 5.0.0" },
-    { "name": "puppetlabs/apt", "version_requirement": ">= 2.1.0 < 3.0.0" },
+    { "name": "puppetlabs/apt", "version_requirement": ">= 2.1.0 < 5.0.0" },
     { "name": "puppetlabs/java", "version_requirement": ">= 1.0.1 < 2.0.0" },
     { "name": "darin/zypprepo", "version_requirement": ">= 1.0.1 < 2.0.0" },
     { "name": "puppet/archive", "version_requirement": ">= 1.3.0 < 2.0.0" },

diff --git a/spec/classes/jenkins_repo_debian_spec.rb b/spec/classes/jenkins_repo_debian_spec.rb
@@ -4,10 +4,14 @@
   # Switching OS Family to prevent duplicate declaration
   let(:facts) do
     {
-      :osfamily => 'Debian',
+      :osfamily        => 'Debian',
       :lsbdistcodename => 'precise',
-      :lsbdistid => 'ubuntu',
-      :operatingsystem => 'Debian'
+      :lsbdistid       => 'ubuntu',
+      :operatingsystem => 'Debian',
+      :os              => {
+        :name    => 'Debian',
+        :release => { :full => '11.04' },
+      },
     }
   end
 

diff --git a/spec/classes/jenkins_repo_spec.rb b/spec/classes/jenkins_repo_spec.rb
@@ -26,7 +26,16 @@
       end
 
       describe 'Debian' do
-        let(:facts) { { :osfamily => 'Debian', :lsbdistid => 'debian', :lsbdistcodename => 'natty', :operatingsystem => 'Debian' } }
+        let(:facts) {{
+          :osfamily        => 'Debian',
+          :lsbdistid       => 'debian',
+          :lsbdistcodename => 'natty',
+          :operatingsystem => 'Debian',
+          :os              => {
+            :name    => 'Debian',
+            :release => { :full => '11.04' },
+          },
+        }}
         it { should contain_class('jenkins::repo::debian') }
         it { should_not contain_class('jenkins::repo::suse') }
         it { should_not contain_class('jenkins::repo::el') }

diff --git a/spec/defines/jenkins_sysconfig_spec.rb b/spec/defines/jenkins_sysconfig_spec.rb
@@ -31,7 +31,11 @@
         :osfamily        => 'Debian',
         :operatingsystem => 'Debian',
         :lsbdistcodename => 'squeeze',
-        :lsbdistid       => 'bebian'
+        :lsbdistid       => 'debian',
+        :os              => {
+          :name    => 'Debian',
+          :release => { :full => '11.04' },
+        },
       }
     end