particle-os/debian-koji
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove rpm-py-installer, update test docs and update Dockerfiles

Browse source 
Remove rpm-py-installer from requirements
Check duplicite and unused packages in Dockerfiles and test-requirements
Update docs about unit tests.

Fixes: https://pagure.io/koji/issue/3868
This commit is contained in:
Jana Cupova 2024-01-21 10:54:50 +01:00 • committed by Tomas Kopecek
parent 119ec31685
commit ba612e1e90
17 changed files with 88 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

17
devtools/containers/Dockerfile.centos7
View file

@ -5,29 +5,16 @@ RUN \
dnf \
dnf-plugins-core \
gcc \
git \
make \
krb5-devel \
libffi-devel \
openssl-devel \
pyOpenSSL \
python-cheetah \
python-devel \
python-librepo \
python-requests \
redhat-rpm-config \
rpm-build \
rpm-python \
yum-utils && \
rpm-build && \
yum install -y epel-release && \
yum install -y \
python-flake8 \
python-multilib \
python-pip \
python-psycopg2 \
python-qpid-proton \
python-requests-kerberos \
yumdownloader && \
python-psycopg2 && \
yum clean all && \
pip install -U 'pip==9.0.1' && \
pip install -U tox

16
devtools/containers/Dockerfile.centos8
View file

@ -4,25 +4,11 @@ RUN \
dnf -y update --nodocs --setopt=install_weak_deps=False && \
dnf install -y --nodocs --setopt=install_weak_deps=False epel-release && \
dnf install -y --nodocs --setopt=install_weak_deps=False \
'dnf-command(download)' \
gcc \
git \
glib2-devel \
glibc-langpack-en \
krb5-devel \
libffi-devel \
libxml2-devel \
make \
openssl-devel \
python3-devel \
python3-librepo \
python3-pip \
python3-pytest \
python3-rpm \
python3-tox \
redhat-rpm-config \
rpm-build \
rpm-devel \
sqlite-devel \
yum-utils && \
rpm-build && \
dnf clean all

16
devtools/containers/Dockerfile.centos9
View file

@ -4,25 +4,11 @@ RUN \
dnf -y update --nodocs --setopt=install_weak_deps=False && \
dnf install -y --nodocs --setopt=install_weak_deps=False epel-release && \
dnf install -y --nodocs --setopt=install_weak_deps=False --enablerepo crb \
'dnf-command(download)' \
gcc \
git \
glib2-devel \
glibc-langpack-en \
krb5-devel \
libffi-devel \
libxml2-devel \
make \
openssl-devel \
python3-devel \
python3-librepo \
python3-pip \
python3-pytest \
python3-rpm \
python3-tox \
redhat-rpm-config \
rpm-build \
rpm-devel \
sqlite-devel \
yum-utils && \
rpm-build && \
dnf clean all

20
devtools/containers/Dockerfile.f34
View file

@ -2,25 +2,11 @@ FROM registry.fedoraproject.org/fedora:34
RUN \
dnf -y update --nodocs --setopt=install_weak_deps=False && \
dnf install -y --nodocs --setopt=install_weak_deps=False \
'dnf-command(download)' \
gcc \
git \
glib2-devel \
glibc-langpack-en \
krb5-devel \
libffi-devel \
python3-librepo \
libxml2-devel \
make \
openssl-devel \
python3-devel \
python3-pip \
python3-pytest \
python3-rpm \
python3-librepo \
python3-tox \
redhat-rpm-config \
rpm-build \
rpm-devel \
sqlite-devel \
yum-utils && \
dnf clean all\
rpm-build && \
dnf clean all

20
devtools/containers/Dockerfile.f35
View file

@ -2,25 +2,11 @@ FROM registry.fedoraproject.org/fedora:35
RUN \
dnf -y update --nodocs --setopt=install_weak_deps=False && \
dnf install -y --nodocs --setopt=install_weak_deps=False \
'dnf-command(download)' \
gcc \
git \
glib2-devel \
glibc-langpack-en \
krb5-devel \
libffi-devel \
python3-librepo \
libxml2-devel \
make \
openssl-devel \
python3-devel \
python3-pip \
python3-pytest \
python3-rpm \
python3-librepo \
python3-tox \
redhat-rpm-config \
rpm-build \
rpm-devel \
sqlite-devel \
yum-utils && \
dnf clean all\
rpm-build && \
dnf clean all

20
devtools/containers/Dockerfile.f36
View file

@ -2,25 +2,11 @@ FROM registry.fedoraproject.org/fedora:36
RUN \
dnf -y update --nodocs --setopt=install_weak_deps=False && \
dnf install -y --nodocs --setopt=install_weak_deps=False \
'dnf-command(download)' \
gcc \
git \
glib2-devel \
glibc-langpack-en \
krb5-devel \
libffi-devel \
python3-librepo \
libxml2-devel \
make \
openssl-devel \
python3-devel \
python3-pip \
python3-pytest \
python3-rpm \
python3-librepo \
python3-tox \
redhat-rpm-config \
rpm-build \
rpm-devel \
sqlite-devel \
yum-utils && \
dnf clean all\
rpm-build && \
dnf clean all

20
devtools/containers/Dockerfile.f37
View file

@ -2,25 +2,11 @@ FROM registry.fedoraproject.org/fedora:37
RUN \
dnf -y update --nodocs --setopt=install_weak_deps=False && \
dnf install -y --nodocs --setopt=install_weak_deps=False \
'dnf-command(download)' \
gcc \
git \
glib2-devel \
glibc-langpack-en \
krb5-devel \
libffi-devel \
python3-librepo \
libxml2-devel \
make \
openssl-devel \
python3-devel \
python3-pip \
python3-pytest \
python3-rpm \
python3-librepo \
python3-tox \
redhat-rpm-config \
rpm-build \
rpm-devel \
sqlite-devel \
yum-utils && \
dnf clean all\
rpm-build && \
dnf clean all

20
devtools/containers/Dockerfile.f38
View file

@ -2,25 +2,11 @@ FROM registry.fedoraproject.org/fedora:38
RUN \
dnf -y update --nodocs --setopt=install_weak_deps=False && \
dnf install -y --nodocs --setopt=install_weak_deps=False \
'dnf-command(download)' \
gcc \
git \
glib2-devel \
glibc-langpack-en \
krb5-devel \
libffi-devel \
python3-librepo \
libxml2-devel \
make \
openssl-devel \
python3-devel \
python3-pip \
python3-pytest \
python3-rpm \
python3-librepo \
python3-tox \
redhat-rpm-config \
rpm-build \
rpm-devel \
sqlite-devel \
yum-utils && \
dnf clean all\
rpm-build && \
dnf clean all

20
devtools/containers/Dockerfile.f39
View file

@ -2,25 +2,11 @@ FROM registry.fedoraproject.org/fedora:39
RUN \
dnf -y update --nodocs --setopt=install_weak_deps=False && \
dnf install -y --nodocs --setopt=install_weak_deps=False \
'dnf-command(download)' \
gcc \
git \
glib2-devel \
glibc-langpack-en \
krb5-devel \
libffi-devel \
python3-librepo \
libxml2-devel \
make \
openssl-devel \
python3-devel \
python3-pip \
python3-pytest \
python3-rpm \
python3-librepo \
python3-tox \
redhat-rpm-config \
rpm-build \
rpm-devel \
sqlite-devel \
yum-utils && \
dnf clean all\
rpm-build && \
dnf clean all

18
devtools/containers/Dockerfile.rawhide
View file

@ -2,25 +2,11 @@ FROM registry.fedoraproject.org/fedora:rawhide
RUN \
dnf -y update --nodocs --setopt=install_weak_deps=False && \
dnf install -y --nodocs --setopt=install_weak_deps=False \
'dnf-command(download)' \
gcc \
git \
glib2-devel \
glibc-langpack-en \
krb5-devel \
libffi-devel \
python3-librepo \
libxml2-devel \
make \
openssl-devel \
python3-devel \
python3-pip \
python3-pytest \
python3-rpm \
python3-librepo \
python3-tox \
redhat-rpm-config \
rpm-build \
rpm-devel \
sqlite-devel \
yum-utils && \
rpm-build && \
dnf clean all

24
devtools/containers/README.md
View file

@ -6,21 +6,31 @@ provided:
* [`./Dockerfile.centos7`](./Dockerfile.centos7) CentOS 7, for testing with python2.7
* [`./Dockerfile.centos8`](./Dockerfile.centos8) CentOS 8, for testing with python3.6
* [`./Dockerfile.f32`](./Dockerfile.f32) Fedora 32, for testing with python3.8
* [`./Dockerfile.f33`](./Dockerfile.f33) Fedora 33, for testing with python3.9
* [`./Dockerfile.centos9`](./Dockerfile.centos8) CentOS 9, for testing with python3.9
* [`./Dockerfile.f34`](...) Fedora 34, for testing with python3.9
* [`./Dockerfile.f35`](./Dockerfile.f32) Fedora 35, for testing with python3.10
* [`./Dockerfile.f36`](./Dockerfile.f32) Fedora 36, for testing with python3.10
* [`./Dockerfile.f37`](./Dockerfile.f32) Fedora 37, for testing with python3.11
* [`./Dockerfile.f38`](./Dockerfile.f32) Fedora 38, for testing with python3.11
* [`./Dockerfile.f39`](./Dockerfile.f32) Fedora 39, for testing with python3.12
* [`./Dockerfile.rawhide`](./Dockerfile.rawhie) Fedora Rawhide, for testing with python3.?
To use them, taking fedora as an example:
docker build -t koji_test_fedora:32 --no-cache -f Dockerfile.f32
docker run --rm -v $PWD:/koji --name koji_test koji_test_fedora:32 bash -c "cd /koji && tox -e flake8,py3"
docker build -t koji_test_fedora:39 --no-cache -f Dockerfile.f39
docker run --rm -v $PWD:/koji --name koji_test koji_test_fedora:39 bash -c "cd /koji && tox -e flake8,py3,bandit"
Or CentOS as an example:
Or CentOS with py3 as an example:
docker build -t koji_test_centos:8 --no-cache -f Dockerfile.centos8
docker run --rm -v $PWD:/koji --name koji_test koji_test_centos:8 bash -c "cd /koji && tox -e py2"
docker run --rm -v $PWD:/koji --name koji_test koji_test_centos:8 bash -c "cd /koji && tox -e flake8,py3,bandit"
Or CentOS with py2 as an example:
docker build -t koji_test_centos:7 --no-cache -f Dockerfile.centos8
docker run --rm -v $PWD:/koji --name koji_test koji_test_centos:7 bash -c "cd /koji && tox -e py2"
When running with Podman and SELinux enabled, use the "--security-opt
label=disable" option:
podman run --rm -v $PWD:/koji --security-opt label=disable --name koji_test koji_test_fedora:32 bash -c "cd /koji && ls -l /koji && tox -e flake8,py3"
podman run --rm -v $PWD:/koji --security-opt label=disable --name koji_test koji_test_fedora:39 bash -c "cd /koji && ls -l /koji && tox -e flake8,py3,bandit"