Browse Source

Add missing test dependencies for CI containers

These dependencies should allow the tests to correctly run...

Signed-off-by: Neal Gompa <ngompa13@gmail.com>
Neal Gompa 2 years ago
parent
commit
292391cdd1
2 changed files with 6 additions and 4 deletions
  1. 3 2
      dev/containers/centos8-rpms-py3
  2. 3 2
      dev/containers/fedora-rpms-py3

+ 3 - 2
dev/containers/centos8-rpms-py3

@@ -13,12 +13,14 @@ RUN dnf -y config-manager --enable epel-testing epel-next-testing powertools
 
 RUN dnf -y install \
     python3-setuptools \
+    python3-beautifulsoup4 \
     python3-coverage \
     python3-mock \
     python3-docutils \
     python3-flake8 \
     python3-pytest-xdist \
     python3-cchardet \
+    python3-flask-oidc \
     python3-fedora-messaging \
     python3-pip \
     redis \
@@ -34,8 +36,7 @@ RUN cd / \
 # Install all the requirements from the spec file and replace the macro
 # %{python_pkgversion} by '3' which thus installs all the py3 version of
 # the dependencies.
-RUN sed -i "/Requires:           python%{python_pkgversion}-enum34/d" /pagure/files/pagure.spec && \
-    dnf -y install `grep "Requires:" /pagure/files/pagure.spec | \
+RUN dnf -y install `grep "Requires:" /pagure/files/pagure.spec | \
     awk '{split($0, a, " "); print a[2]}' |grep -v "%{name}" | \
     sed -e "s|%{python_pkgversion}|3|"` && \
     dnf clean all && \

+ 3 - 2
dev/containers/fedora-rpms-py3

@@ -8,12 +8,14 @@ ENV BRANCH=$branch
 
 RUN dnf -y --enablerepo=updates-testing install \
     python3-setuptools \
+    python3-beautifulsoup4 \
     python3-coverage \
     python3-mock \
     python3-docutils \
     python3-black \
     python3-flake8 \
     python3-pytest-xdist \
+    python3-flask-oidc \
     python3-cchardet \
     python3-fedora-messaging \
     python3-pip \
@@ -30,8 +32,7 @@ RUN cd / \
 # Install all the requirements from the spec file and replace the macro
 # %{python_pkgversion} by '3' which thus installs all the py3 version of
 # the dependencies.
-RUN sed -i "/Requires:           python%{python_pkgversion}-enum34/d" /pagure/files/pagure.spec && \
-    dnf install -y --enablerepo=updates-testing `grep "Requires:" /pagure/files/pagure.spec | \
+RUN dnf install -y --enablerepo=updates-testing `grep "Requires:" /pagure/files/pagure.spec | \
     awk '{split($0, a, " "); print a[2]}' |grep -v "%{name}" | \
     sed -e "s|%{python_pkgversion}|3|"` && \
     dnf clean all && \