The 'check-patch' and 'check-dco' jobs only need Python and git for
checking the patches, so it's not really necessary to use a container
here that has all the other build dependencies installed. By installing
"git" in the python container, we can use this light-weight container
for these jobs instead.
Signed-off-by: Thomas Huth <th...@redhat.com>
---
Mark as RFC since I'm not sure whether we want to have "git" in
the python container or not?
.gitlab-ci.d/static_checks.yml | 8 ++++----
tests/docker/dockerfiles/python.docker | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.d/static_checks.yml b/.gitlab-ci.d/static_checks.yml
index 5e955540d3..0e080bd0a0 100644
--- a/.gitlab-ci.d/static_checks.yml
+++ b/.gitlab-ci.d/static_checks.yml
@@ -1,8 +1,8 @@
check-patch:
stage: build
- image: $CI_REGISTRY_IMAGE/qemu/centos8:latest
+ image: $CI_REGISTRY_IMAGE/qemu/python:latest
needs:
- job: amd64-centos8-container
+ job: python-container
script:
- .gitlab-ci.d/check-patch.py
variables:
@@ -15,9 +15,9 @@ check-patch:
check-dco:
stage: build
- image: $CI_REGISTRY_IMAGE/qemu/centos8:latest
+ image: $CI_REGISTRY_IMAGE/qemu/python:latest
needs:
- job: amd64-centos8-container
+ job: python-container
script: .gitlab-ci.d/check-dco.py
variables:
GIT_DEPTH: 1000
diff --git a/tests/docker/dockerfiles/python.docker
b/tests/docker/dockerfiles/python.docker
index 56d88417df..b2fb3a306d 100644
--- a/tests/docker/dockerfiles/python.docker
+++ b/tests/docker/dockerfiles/python.docker
@@ -6,6 +6,7 @@ MAINTAINER John Snow <js...@redhat.com>
# Please keep this list sorted alphabetically
ENV PACKAGES \
gcc \
+ git \
make \
pipenv \
python3 \
--
2.27.0
