Permalink
Browse files

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.
  • Loading branch information...
haus committed Nov 14, 2012
1 parent f684b50 commit 4344c74be37c2e4bb0180b8017e9c1c33b6c9a86
Showing with 12 additions and 1 deletion.
  1. +5 −0 templates/mock-config.erb
  2. +7 −1 templates/pe-mock-config.erb
@@ -1,3 +1,8 @@
+# **********************************
+# Puppet Labs mock configuration
+# <%=name%>
+# Managed by Puppet
+# **********************************
<%
# Set up internal variables for fedora and centos mirrors, which vary greatly in format.
if dist == "fedora"
@@ -7,7 +7,7 @@
config_opts['root'] = '<%=name%>'
config_opts['target_arch'] = '<%=arch%>'
config_opts['legal_host_arches'] = (<%= if arch =~ /i\d86/ then "'i386', 'i586', 'i686', 'x86_64'" else "x86_64" end %>)
-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'
+config_opts['chroot_setup_cmd'] = 'groupinstall buildsys-build'
config_opts['dist'] = '<%=dist%><%=release%>' # only useful for --resultdir variable subst
config_opts['plugin_conf']['ccache_enable'] = False
config_opts['macros']['%dist'] = '.<%=dist%><%=release%>'
@@ -45,4 +45,10 @@ enabled=1
baseurl=http://neptune.puppetlabs.lan/<%=pe_ver%>/repos/<%=dist%>-<%=release%>-<%=arch%>/
skip_if_unavailable=1
proxy=_none_
+
+[epel]
+name=epel
+mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=epel-<%=release%>&arch=<%=arch%>
+failovermethod=priority
+includepkgs=ccache
"""

0 comments on commit 4344c74

Please sign in to comment.