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

Commit 4344c74

Browse files
committed
Add ccache to pe-mock, add header to FOSS template
This commit adds the epel repo with just the ccache package to the pe-mock config. It also updates the chroot_setup_cmd to install the buildsys-build group which is available once the epel repo is added. It also adds a header to the FOSS mock config to identify it as a puppet template.
1 parent f684b50 commit 4344c74

File tree

2 files changed

+12
-1
lines changed

2 files changed

+12
-1
lines changed

templates/mock-config.erb

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
# **********************************
2+
# Puppet Labs mock configuration
3+
# <%=name%>
4+
# Managed by Puppet
5+
# **********************************
16
<%
27
# Set up internal variables for fedora and centos mirrors, which vary greatly in format.
38
if dist == "fedora"

templates/pe-mock-config.erb

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
config_opts['root'] = '<%=name%>'
88
config_opts['target_arch'] = '<%=arch%>'
99
config_opts['legal_host_arches'] = (<%= if arch =~ /i\d86/ then "'i386', 'i586', 'i686', 'x86_64'" else "x86_64" end %>)
10-
config_opts['chroot_setup_cmd'] = 'install bash bzip2 coreutils cpio curl cvs diffutils fedpkg findutils gawk gcc gcc-c++ gnupg grep gzip info make patch redhat-release redhat-release-server redhat-rpm-config rpm-build sed shadow-utils tar unzip util-linux-ng which xz buildsys-macros'
10+
config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
1111
config_opts['dist'] = '<%=dist%><%=release%>' # only useful for --resultdir variable subst
1212
config_opts['plugin_conf']['ccache_enable'] = False
1313
config_opts['macros']['%dist'] = '.<%=dist%><%=release%>'
@@ -45,4 +45,10 @@ enabled=1
4545
baseurl=http://neptune.puppetlabs.lan/<%=pe_ver%>/repos/<%=dist%>-<%=release%>-<%=arch%>/
4646
skip_if_unavailable=1
4747
proxy=_none_
48+
49+
[epel]
50+
name=epel
51+
mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-<%=release%>&arch=<%=arch%>
52+
failovermethod=priority
53+
includepkgs=ccache
4854
"""

0 commit comments

Comments
 (0)