From 10d70f51e1aa4b07918424f7ae844445f4950bb6 Mon Sep 17 00:00:00 2001 From: mprahl Date: Fri, 13 Sep 2019 09:11:01 -0400 Subject: [PATCH 1/2] Install python3-pytest-cov in the C3I Dockerfile since it's now used by tox --- openshift/backend/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/openshift/backend/Dockerfile b/openshift/backend/Dockerfile index 3b9f4b32..314cdcff 100644 --- a/openshift/backend/Dockerfile +++ b/openshift/backend/Dockerfile @@ -13,7 +13,7 @@ WORKDIR /src # TODO: Unpin the `python3-libmodulemd` RPM once MBS is released with libmodulemd v2 RUN ${DNF_CMD} install \ 'dnf-command(builddep)' rpm-build rpmdevtools rpmlint \ - python3-tox python3-pytest python3-mock python3-flake8 bandit python3-libmodulemd && \ + python3-tox python3-pytest python3-pytest-cov python3-mock python3-flake8 bandit python3-libmodulemd && \ ${DNF_CMD} builddep *.spec && \ ${DNF_CMD} clean all RUN rpmdev-setuptree && \ From 86b16d61c02be74d1880195c77c9fb87b7023ad9 Mon Sep 17 00:00:00 2001 From: mprahl Date: Fri, 13 Sep 2019 09:11:42 -0400 Subject: [PATCH 2/2] Unpin python3-libmodulemd in the C3I tests since the MBS RPM requires it directly --- openshift/backend/Dockerfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/openshift/backend/Dockerfile b/openshift/backend/Dockerfile index 314cdcff..28a29aef 100644 --- a/openshift/backend/Dockerfile +++ b/openshift/backend/Dockerfile @@ -10,10 +10,9 @@ ARG DNF_CMD="dnf -y --setopt=deltarpm=0 --setopt=install_weak_deps=false --setop COPY . /src WORKDIR /src -# TODO: Unpin the `python3-libmodulemd` RPM once MBS is released with libmodulemd v2 RUN ${DNF_CMD} install \ 'dnf-command(builddep)' rpm-build rpmdevtools rpmlint \ - python3-tox python3-pytest python3-pytest-cov python3-mock python3-flake8 bandit python3-libmodulemd && \ + python3-tox python3-pytest python3-pytest-cov python3-mock python3-flake8 bandit && \ ${DNF_CMD} builddep *.spec && \ ${DNF_CMD} clean all RUN rpmdev-setuptree && \