Merge branch 'ci-cleanups' into 'master'

CI Cleanups

See merge request adam-mercer/koji-packager!3

.gitlab-ci.yml

@@ -13,8 +13,8 @@ cache:
   paths:
     - .cache/pip
 
-.install-epel7: &install-epel7 |
-  rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm
+.install-epel7: &install-epel7
+  yum ${YUM_OPTS} install epel-release
 
 # -- lint -------------------
 
@@ -48,7 +48,7 @@ dist:tarball:
 
 # -- build ------------------
 
-.yum-install-build-deps: &yum-install-build-deps |
+.yum-install-build-deps: &yum-install-build-deps
   yum ${YUM_OPTS} install yum-utils rpm-build python3-rpm-macros
 
 .build:el: &build-rhel
@@ -74,7 +74,7 @@ dist:tarball:
 
 build:el7:
   <<: *build-rhel
-  image: centos:centos7
+  image: ligo/base:el7
   before_script:
     - *install-epel7
     - *yum-install-build-deps
@@ -112,7 +112,7 @@ test:python3.7:
 
 test:el7:
   <<: *test
-  image: centos:centos7
+  image: ligo/base:el7
   dependencies:
     - build:el7
   before_script: