Merge pull request #352 from voxpupuli/vcsrepo-user

Clone git repository as $user

manifests/init.pp

@@ -138,7 +138,7 @@
       vcsrepo { "${basedir}/puppetboard":
         ensure   => present,
         provider => git,
-        owner    => $user,
+        user     => $user,
         source   => $git_source,
         revision => $revision,
         require  => [
@@ -148,12 +148,7 @@
         before   => [
           File[$settings_file],
         ],
-      }
-
-      file { "${basedir}/puppetboard":
-        owner   => $user,
-        recurse => true,
-        require => Vcsrepo["${basedir}/puppetboard"],
+        notify   => Python::Requirements["${basedir}/puppetboard/requirements.txt"],
       }
 
       $pyvenv_proxy_env = $python_proxy ? {

spec/acceptance/class_spec.rb

@@ -2,7 +2,9 @@
 
 require 'spec_helper_acceptance'
 
-describe 'puppetboard class' do
+require_relative 'support/puppetdb'
+
+describe 'puppetboard class', if: has_puppetdb do
   case fact('os.family')
   when 'RedHat'
     apache_conf_file = '/etc/httpd/conf.d/25-puppetboard.conf'

spec/acceptance/support/puppetdb.rb

@@ -0,0 +1,10 @@
+# frozen_string_literal: true
+
+def has_puppetdb
+  case host_inventory['facter']['os']['name']
+  when 'Debian'
+    return false if ENV['BEAKER_PUPPET_COLLECTION'] == 'puppet6' && host_inventory['facter']['os']['release']['major'] == '11'
+  end
+
+  true
+end

spec/classes/puppetboard_spec.rb

@@ -18,7 +18,6 @@
         it { is_expected.to contain_package('py38-puppetboard') }
       else
         it { is_expected.to contain_file('/srv/puppetboard/puppetboard/settings.py') }
-        it { is_expected.to contain_file('/srv/puppetboard/puppetboard') }
         it { is_expected.to contain_file('/srv/puppetboard') }
         it { is_expected.to contain_python__pyvenv('/srv/puppetboard/virtenv-puppetboard') }
         it { is_expected.to contain_vcsrepo('/srv/puppetboard/puppetboard') }

spec/setup_acceptance_node.pp

@@ -0,0 +1,8 @@
+if $facts['os']['name'] == 'Ubuntu' {
+  # Needed for facter to fetch facts used by the postgresql module
+  if versioncmp($facts['facterversion'], '4.0.0') <= 0 {
+    package{ 'lsb-release':
+      ensure => present,
+    }
+  }
+}