Remove special handling for PCP installation

We will now get the PCP RPMs from the distro repos instead of
from upstream.

agent/containers/images/Dockerfile.layered.j2

@@ -7,13 +7,10 @@ ENTRYPOINT ["/container_entrypoint"]
 {% endif %}
 
 {% if kind in ('tools', 'all') %}
-{% if distro.startswith('fedora') or distro == 'centos-7' or distro == 'centos-8' %}
-COPY ./{{ distro }}-pcp.repo /etc/yum.repos.d/pcp.repo
-{% if distro.startswith('centos') %}
+{% if distro == 'centos-7' or distro == 'centos-8' %}
 COPY ./{{ distro }}-prometheus.repo /etc/yum.repos.d/prometheus.repo
 {% endif %}
 {% endif %}
-{% endif %}
 
 # Install all the RPMs required for this image.
 #

agent/containers/images/Makefile

@@ -238,10 +238,8 @@ repofix: $(_DEFAULT_DISTROS:%=%-repofix)
 	./apply-tags pbench-agent-tools-$* $*-tags.lis
 
 # CentOS 7 & 8 (but not 9) require an additional .repo file for Prometheus for
-# the tools container; analogously, they as well as Fedora require an additional
-# .repo file for PCP.
+# the tools container.
 centos-7-tools centos-8-tools: centos-%-tools: centos-%-prometheus.repo
-$(_ALL_fedora_VERSIONS:%=%-tools) centos-7-tools centos-8-tools: %-tools: %-pcp.repo
 
 %-tools: %-base-tagged %-tools.Dockerfile %-tags.lis
 	./build-image tools $* $*-tags.lis
@@ -398,9 +396,6 @@ all-tags: pkgmgr-clean $(_DEFAULT_DISTROS:%=%-tags.lis)
         -D distro=$(if $(filter centos,${DIST_NAME}),$(subst centos,epel,$*),$*) \
         -D url_prefix=${URL_PREFIX} -o $@
 
-%-pcp.repo: pcp.repo.j2
-	jinja2 pcp.repo.j2 -D distro=${DIST_NAME} -D version=${DIST_VERSION} -o $@
-
 %-prometheus.repo:
 	curl -sSf "${_PROMETHEUS_REPO_URL}" > $@