Fix for when ci_package_repo is set to master

Fixes voxpupuli#653
alexjfisher · Nov 11, 2018 · 9e58bdb · 9e58bdb
1 parent 9624672
commit 9e58bdb
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 2 deletions.
diff --git a/manifests/repo.pp b/manifests/repo.pp
@@ -5,6 +5,11 @@
   if $collectd::manage_repo {
     $osfamily_downcase = downcase($facts['os']['family'])
 
+    $real_ci_package_repo = $collectd::ci_package_repo ? {
+      'master' => $collectd::ci_package_repo,
+      default  => "collectd-${collectd::ci_package_repo}",
+    }
+
     if defined("::collectd::repo::${osfamily_downcase}") {
       require "::collectd::repo::${osfamily_downcase}"
     } else {

diff --git a/manifests/repo/debian.pp b/manifests/repo/debian.pp
@@ -6,7 +6,7 @@
 
     apt::source { 'collectd-ci':
       location => 'https://pkg.ci.collectd.org/deb/',
-      repos    => "collectd-${$::collectd::ci_package_repo}",
+      repos    => $collectd::repo::real_ci_package_repo,
       key      => {
         'id'     => 'F806817DC3F5EA417F9FA2963994D24FB8543576',
         'server' => $::collectd::package_keyserver,

diff --git a/manifests/repo/redhat.pp b/manifests/repo/redhat.pp
@@ -5,7 +5,7 @@
     yumrepo { 'collectd-ci':
       ensure  => present,
       enabled => '1',
-      baseurl => "https://pkg.ci.collectd.org/rpm/collectd-${::collectd::ci_package_repo}/epel-${::operatingsystemmajrelease}-${::architecture}",
+      baseurl => "https://pkg.ci.collectd.org/rpm/${collectd::repo::real_ci_package_repo}/epel-${::operatingsystemmajrelease}-${::architecture}",
       gpgkey  => 'https://pkg.ci.collectd.org/pubkey.asc',
     }
 

diff --git a/spec/classes/collectd_init_spec.rb b/spec/classes/collectd_init_spec.rb
@@ -241,6 +241,16 @@
               end
             end
           end
+          context 'and ci_package_repo set to `master`' do
+            let(:params) { { manage_repo: true, ci_package_repo: 'master' } }
+
+            if facts[:osfamily] == 'RedHat'
+              it { is_expected.to contain_yumrepo('collectd-ci').with_baseurl("https://pkg.ci.collectd.org/rpm/master/epel-#{facts[:operatingsystemmajrelease]}-x86_64") }
+            end
+            if facts[:osfamily] == 'Debian'
+              it { is_expected.to contain_apt__source('collectd-ci').with_repos('master') }
+            end
+          end
         end
 
         context 'when manage_service is true' do