Commit e27d56cb authored by Adam Mercer's avatar Adam Mercer
Browse files

Merge branch 'ci-cleanups' into 'master'

CI Cleanups

See merge request adam-mercer/koji-packager!3
parents eb97b0d3 a44492f8
...@@ -13,8 +13,8 @@ cache: ...@@ -13,8 +13,8 @@ cache:
paths: paths:
- .cache/pip - .cache/pip
.install-epel7: &install-epel7 | .install-epel7: &install-epel7
rpm -ivh https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm yum ${YUM_OPTS} install epel-release
# -- lint ------------------- # -- lint -------------------
...@@ -48,7 +48,7 @@ dist:tarball: ...@@ -48,7 +48,7 @@ dist:tarball:
# -- build ------------------ # -- 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 yum ${YUM_OPTS} install yum-utils rpm-build python3-rpm-macros
.build:el: &build-rhel .build:el: &build-rhel
...@@ -74,7 +74,7 @@ dist:tarball: ...@@ -74,7 +74,7 @@ dist:tarball:
build:el7: build:el7:
<<: *build-rhel <<: *build-rhel
image: centos:centos7 image: ligo/base:el7
before_script: before_script:
- *install-epel7 - *install-epel7
- *yum-install-build-deps - *yum-install-build-deps
...@@ -112,7 +112,7 @@ test:python3.7: ...@@ -112,7 +112,7 @@ test:python3.7:
test:el7: test:el7:
<<: *test <<: *test
image: centos:centos7 image: ligo/base:el7
dependencies: dependencies:
- build:el7 - build:el7
before_script: before_script:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment