diff --git a/.mergify.yml b/.mergify.yml index 98f8dba399..63c7ce0895 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,10 +8,6 @@ pull_request_rules: - label!=WIP - approved-reviews-by=@fedora-infra/bodhi - status-success=DCO - - status-success=f28-docs - - status-success=f28-unit - - status-success=f28-diff-cover - - status-success=f28-integration - status-success=f29-docs - status-success=f29-unit - status-success=f29-diff-cover @@ -38,10 +34,6 @@ pull_request_rules: - author=@fedora-infra/bodhi - "#approved-reviews-by>=1" - status-success=DCO - - status-success=f28-docs - - status-success=f28-unit - - status-success=f28-diff-cover - - status-success=f28-integration - status-success=f29-docs - status-success=f29-unit - status-success=f29-diff-cover diff --git a/devel/ci/Dockerfile-f28 b/devel/ci/Dockerfile-f28 deleted file mode 100644 index cd64a613ee..0000000000 --- a/devel/ci/Dockerfile-f28 +++ /dev/null @@ -1,64 +0,0 @@ -FROM registry.fedoraproject.org/fedora:28 -LABEL maintainer="Randy Barlow " - -# Work around a severe dnf/libsolv/glibc issue: https://pagure.io/releng/issue/7125 -# This was suggested in a BZ comment: https://bugzilla.redhat.com/show_bug.cgi?id=1483553#c78 -RUN dnf upgrade -y libsolv || echo "We are not trying to test dnf upgrade, so ignoring dnf failure." -# The echo works around https://bugzilla.redhat.com/show_bug.cgi?id=1483553 and any other future dnf -# upgrade bugs. -RUN dnf upgrade -y || echo "We are not trying to test dnf upgrade, so ignoring dnf failure." -RUN dnf install --disablerepo rawhide-modular -y \ - createrepo_c \ - findutils \ - gcc \ - git \ - python3-createrepo_c \ - python3-koji \ - make \ - python3-alembic \ - python3-arrow \ - python3-backoff \ - python3-bleach \ - python3-bugzilla \ - python3-click \ - python3-colander \ - python3-devel \ - python3-diff-cover \ - python3-dogpile-cache \ - python3-fedora \ - python3-feedgen \ - python3-jinja2 \ - python3-libcomps \ - python3-librepo \ - python3-markdown \ - python3-munch \ - python3-openid \ - python3-psycopg2 \ - python3-pylibravatar \ - python3-pyramid \ - python3-pyramid-mako \ - python3-pytest \ - python3-pytest-cov \ - python3-pyyaml \ - python3-responses \ - python3-simplemediawiki \ - python3-sqlalchemy \ - python3-webtest \ - python3-cornice \ - python3-cornice-sphinx \ - python3-pyramid-fas-openid \ - redhat-rpm-config - -# sqlalchemy_schemadisplay is not packaged for Python 3 in Fedora < 30 -# fedora_messaging isn't packaged for Fedora 28 -RUN pip-3 install sqlalchemy_schemadisplay fedora_messaging - -# Fake pungi being installed so we can avoid it and all its dependencies -RUN ln -s /usr/bin/true /usr/bin/pungi-koji -VOLUME ["/results"] -WORKDIR /bodhi -CMD ["bash"] -COPY . /bodhi -RUN sed -i '/pyramid_debugtoolbar/d' setup.py -RUN sed -i '/pyramid_debugtoolbar/d' devel/development.ini.example -RUN cp devel/development.ini.example development.ini diff --git a/devel/ci/bodhi-ci b/devel/ci/bodhi-ci index 7e1b6bdd70..2e63698bc4 100755 --- a/devel/ci/bodhi-ci +++ b/devel/ci/bodhi-ci @@ -39,7 +39,7 @@ CONTAINER_LABEL = 'purpose=bodhi-ci-{}'.format(uuid.uuid4()) # This template is used to generate the summary lines that are printed out at the end. LABEL_TEMPLATE = '{:>8}-{:<34}' PROJECT_PATH = os.path.abspath(os.path.join(os.path.dirname(__file__), '..', '..')) -RELEASES = ('f28', 'f29', 'f30', 'rawhide', 'pip') +RELEASES = ('f29', 'f30', 'rawhide', 'pip') def _set_concurrency(ctx, param, value): diff --git a/devel/ci/cico.pipeline b/devel/ci/cico.pipeline index d62261003e..e76bfbc1e7 100644 --- a/devel/ci/cico.pipeline +++ b/devel/ci/cico.pipeline @@ -161,7 +161,6 @@ node('bodhi') { try { parallel( - f28: {test_release('f28')}, f29: {test_release('f29')}, f30: {test_release('f30')}, pip: {test_release('pip')}, @@ -171,7 +170,7 @@ node('bodhi') { failed = error } - def releases = ['f28', 'f29', 'f30', 'pip', 'rawhide'] + def releases = ['f29', 'f30', 'pip', 'rawhide'] for (release in releases) { try { bodhi_ci(release, 'integration', 'integration', '--no-build --no-init') diff --git a/devel/ci/integration/bodhi/Dockerfile-f28 b/devel/ci/integration/bodhi/Dockerfile-f28 deleted file mode 100644 index 55069a5448..0000000000 --- a/devel/ci/integration/bodhi/Dockerfile-f28 +++ /dev/null @@ -1,48 +0,0 @@ -FROM bodhi-ci/f28 -LABEL \ - name="bodhi-web" \ - vendor="Fedora Infrastructure" \ - maintainer="Aurelien Bompard " \ - license="MIT" - -# For integration testing we're using the infrastructure repo -RUN curl -o /etc/yum.repos.d/infra-tags.repo https://infrastructure.fedoraproject.org/cgit/ansible.git/plain/files/common/fedora-infra-tags.repo -RUN dnf upgrade -y - -# Install Bodhi deps (that were not needed by the unittests container) -RUN dnf install -y \ - httpd \ - intltool \ - python3-mod_wsgi \ - skopeo \ - /usr/bin/koji - -# Create bodhi user -RUN groupadd -r bodhi && \ - useradd -r -s /sbin/nologin -d /home/bodhi/ -m -c 'Bodhi Server' -g bodhi bodhi - -# Install it -RUN python3 setup.py build && pip3 install . - -# Configuration -RUN mkdir -p /etc/bodhi -COPY production.ini /etc/bodhi/production.ini - -COPY devel/ci/integration/bodhi/start.sh /etc/bodhi/start.sh -COPY devel/ci/integration/bodhi/httpd.conf /etc/bodhi/httpd.conf -COPY apache/bodhi.wsgi /etc/bodhi/bodhi.wsgi -RUN sed -i -e 's,/var/www,/httpdir,g' /etc/bodhi/bodhi.wsgi - -RUN \ -# Set up krb5 - rm -f /etc/krb5.conf && \ - ln -sf /etc/bodhi/krb5.conf /etc/krb5.conf && \ - ln -sf /etc/keytabs/koji-keytab /etc/krb5.bodhi_bodhi.fedoraproject.org.keytab - -# Apache -RUN mkdir -p /httpdir && chown bodhi:bodhi /httpdir - -EXPOSE 8080 -USER bodhi -ENV USER=bodhi -CMD ["bash", "/etc/bodhi/start.sh"]