Skip to content
This repository was archived by the owner on Jun 5, 2020. It is now read-only.

Commit 40e2120

Browse files
committed
Full overhaul with tests
This commit is an almost complete refactor of the previous module. It removes some of the levers and switches with the repos and instead of using the name of a mock config to figure out how it is laid out, this uses the parameters of a mock config to determine its name. The entry point of init.pp now collects some common params and hands them down to the other manifests if provided.
1 parent 1ae07ff commit 40e2120

28 files changed

+577
-936
lines changed

Rakefile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1-
require 'rubygems'
1+
require 'rake'
2+
require 'rspec/core/rake_task'
23
require 'puppetlabs_spec_helper/rake_tasks'

manifests/init.pp

+25-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,28 @@
1-
class rpmbuilder {
1+
class rpmbuilder(
2+
$fedora_releases = undef,
3+
$el_releases = undef,
4+
$vendor = undef,
5+
$mock_root = undef,
6+
$proxy = undef,
7+
$pe = false,
8+
$pe_vers = undef,
9+
) {
210
include rpmbuilder::repos
311
include rpmbuilder::packages::essential
4-
include rpmbuilder::packages::extra
5-
include rpmbuilder::mock::puppetlabs_mocks
12+
13+
class { rpmbuilder::mock::puppetlabs_mocks:
14+
fedora_releases => $fedora_releases,
15+
el_releases => $el_releases,
16+
vendor => $vendor,
17+
proxy => $proxy,
18+
mock_root => $mock_root,
19+
}
20+
21+
if $pe {
22+
include rpmbuilder::packages::extra
23+
class { rpmbuilder::mock::pe_mocks:
24+
pe_vers => $pe_vers,
25+
mock_root => $mock_root,
26+
}
27+
}
628
}

manifests/mock/create_mock.pp

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
define rpmbuilder::mock::create_mock (
2+
$dist = undef,
3+
$release = undef,
4+
$proxy = false,
5+
$vendor = "Puppet User",
6+
$arch = undef,
7+
$dev = false,
8+
$mock_root = "/etc/mock",
9+
) {
10+
11+
file { $name:
12+
path => "${mock_root}/${name}.cfg",
13+
owner => "root",
14+
group => "mock",
15+
ensure => present,
16+
content => template("rpmbuilder/mock-config.erb"),
17+
mode => "0644",
18+
}
19+
20+
}

manifests/mock/pe_config.pp

-31
This file was deleted.

manifests/mock/pe_mock.pp

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
define rpmbuilder::mock::pe_mock(
2+
$pe_ver,
3+
$dist = "el",
4+
$release,
5+
$arch,
6+
$mock_root = "/etc/mock"
7+
) {
8+
file { $name:
9+
path => "${mock_root}/${name}.cfg",
10+
owner => "root",
11+
group => "mock",
12+
ensure => present,
13+
content => template("rpmbuilder/pe-mock-config.erb"),
14+
mode => "0644",
15+
}
16+
}

0 commit comments

Comments
 (0)