Merge pull request #17654 from stevekuznetsov/skuznets/move-centos-repo

Automatic merge from submit-queue (batch tested with PRs 17429, 17654, 17580).

Move the CBS repo from `source` to `base` image

When we are building images for projects other than Origin, we will
override or circumvent the `openshift/origin-source` image to allow us
to inject RPM repos for the other projects in question. The CBS repo has
nothing to do with the RPM repo injection process and would have to be
re-created in all of the over-rides, so it makes sense to move it to the
`openshift/origin-base` definition and to not require that other
projects remember to add in the CBS repo.

Signed-off-by: Steve Kuznetsov <[email protected]>

/cc @csrwng @Kargakis @smarterclayton @liggitt @deads2k 
/assign @Kargakis @smarterclayton

Author: openshift-merge-robot

images/base/Dockerfile

@@ -6,6 +6,7 @@
 #
 FROM openshift/origin-source
 
+COPY *.repo /etc/yum.repos.d/
 RUN INSTALL_PKGS="bsdtar ceph-common device-mapper device-mapper-persistent-data e2fsprogs ethtool findutils git hostname iptables lsof nmap-ncat socat sysvinit-tools tar tree util-linux wget which xfsprogs" && \
     yum install -y centos-release-ceph-luminous && \
     rpm -V centos-release-ceph-luminous && \