From 6f5d36debbbca31d7b394308a17217015946766a Mon Sep 17 00:00:00 2001 From: Mattia Verga Date: Sun, 14 Mar 2021 10:23:19 +0100 Subject: [PATCH] Goodbye F32, welcome F34 Signed-off-by: Mattia Verga --- .mergify.yml | 6 +++--- Vagrantfile | 6 +++--- devel/ci/{Dockerfile-f32 => Dockerfile-f34} | 5 +++-- devel/ci/Dockerfile-pip | 2 +- devel/ci/bodhi-ci | 2 +- devel/ci/cico.pipeline | 4 ++-- .../ci/integration/bodhi/{Dockerfile-f32 => Dockerfile-f34} | 4 ++-- devel/ci/integration/rabbitmq/Dockerfile | 2 +- devel/ci/integration/resultsdb/Dockerfile | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) rename devel/ci/{Dockerfile-f32 => Dockerfile-f34} (92%) rename devel/ci/integration/bodhi/{Dockerfile-f32 => Dockerfile-f34} (95%) diff --git a/.mergify.yml b/.mergify.yml index da59512208..dcd67adb0c 100644 --- a/.mergify.yml +++ b/.mergify.yml @@ -8,12 +8,12 @@ pull_request_rules: - label!=WIP - approved-reviews-by=@fedora-infra/bodhi - status-success=DCO - - status-success=f32-docs - - status-success=f32-unit - - status-success=f32-diff-cover - status-success=f33-docs - status-success=f33-unit - status-success=f33-diff-cover + - status-success=f34-docs + - status-success=f34-unit + - status-success=f34-diff-cover - status-success=pip-docs - status-success=pip-flake8 - status-success=pip-mypy diff --git a/Vagrantfile b/Vagrantfile index ab47855e0f..ce3d761831 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -37,9 +37,9 @@ end VAGRANTFILE_API_VERSION = "2" Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| - config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/32/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-32-1.6.x86_64.vagrant-libvirt.box" - config.vm.box = "f32-cloud-libvirt" - config.vm.box_download_checksum = "4b13243d39760e59f98078c440d119ccf2699f82128b89daefac02dc99446360" + config.vm.box_url = "https://download.fedoraproject.org/pub/fedora/linux/releases/33/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-33-1.2.x86_64.vagrant-libvirt.box" + config.vm.box = "f33-cloud-libvirt" + config.vm.box_download_checksum = "455767b8ac4d8a4820e186f9674c3b3ef2c5edd65141326b1224dcbc3b9dd1b4" config.vm.box_download_checksum_type = "sha256" # Forward traffic on the host to the development server on the guest. diff --git a/devel/ci/Dockerfile-f32 b/devel/ci/Dockerfile-f34 similarity index 92% rename from devel/ci/Dockerfile-f32 rename to devel/ci/Dockerfile-f34 index 1d106fceee..a9f4cd4006 100644 --- a/devel/ci/Dockerfile-f32 +++ b/devel/ci/Dockerfile-f34 @@ -1,7 +1,7 @@ -FROM registry.fedoraproject.org/fedora:32 +FROM registry.fedoraproject.org/fedora:rawhide LABEL maintainer="Randy Barlow " -RUN dnf install -y \ +RUN dnf install --disablerepo rawhide-modular -y \ createrepo_c \ fedora-messaging \ findutils \ @@ -46,6 +46,7 @@ RUN dnf install -y \ python3-sqlalchemy_schemadisplay \ python3-waitress \ python3-webtest \ + python3-wheel \ python3-whitenoise \ python3-yaml &&\ pip-3 install graphene graphene-sqlalchemy WebOb-GraphQL koji diff --git a/devel/ci/Dockerfile-pip b/devel/ci/Dockerfile-pip index ea3659fb65..575b7b4f67 100644 --- a/devel/ci/Dockerfile-pip +++ b/devel/ci/Dockerfile-pip @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:33 +FROM registry.fedoraproject.org/fedora:latest LABEL maintainer="Randy Barlow " RUN dnf install -y \ diff --git a/devel/ci/bodhi-ci b/devel/ci/bodhi-ci index 62b936ffd4..bf6d03ebe5 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 = ('f32', 'f33', 'rawhide', 'pip') +RELEASES = ('f33', 'f34', 'rawhide', 'pip') INTEGRATION_APPS = ("resultsdb", "waiverdb", "greenwave", "rabbitmq", "ipsilon") diff --git a/devel/ci/cico.pipeline b/devel/ci/cico.pipeline index b3381a2308..8c286c8a85 100644 --- a/devel/ci/cico.pipeline +++ b/devel/ci/cico.pipeline @@ -161,8 +161,8 @@ node('bodhi') { try { parallel( - f32: {test_release('f32')}, f33: {test_release('f33')}, + f34: {test_release('f34')}, pip: {test_release('pip')}, rawhide: {test_release('rawhide')}, ) @@ -170,7 +170,7 @@ node('bodhi') { failed = error } - def releases = ['f32', 'f33', 'pip', 'rawhide'] + def releases = ['f33', 'f34', 'pip', 'rawhide'] for (release in releases) { try { bodhi_ci(release, 'integration', 'integration', '--no-build --no-init') diff --git a/devel/ci/integration/bodhi/Dockerfile-f32 b/devel/ci/integration/bodhi/Dockerfile-f34 similarity index 95% rename from devel/ci/integration/bodhi/Dockerfile-f32 rename to devel/ci/integration/bodhi/Dockerfile-f34 index 18d1b803fa..d71eb5ae31 100644 --- a/devel/ci/integration/bodhi/Dockerfile-f32 +++ b/devel/ci/integration/bodhi/Dockerfile-f34 @@ -1,4 +1,4 @@ -FROM bodhi-ci/f32 +FROM bodhi-ci/f34 LABEL \ name="bodhi-web" \ vendor="Fedora Infrastructure" \ @@ -21,7 +21,7 @@ RUN dnf install -y \ 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 --no-use-pep517 . && pip3 install koji +RUN python3 setup.py bdist_wheel && pip3 install ./dist/*.whl && pip3 install koji # Configuration RUN mkdir -p /etc/bodhi diff --git a/devel/ci/integration/rabbitmq/Dockerfile b/devel/ci/integration/rabbitmq/Dockerfile index 8fdc36f3c9..d3aab2ecb4 100644 --- a/devel/ci/integration/rabbitmq/Dockerfile +++ b/devel/ci/integration/rabbitmq/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:32 +FROM registry.fedoraproject.org/fedora:latest LABEL \ name="rabbitmq" \ vendor="Fedora Infrastructure" \ diff --git a/devel/ci/integration/resultsdb/Dockerfile b/devel/ci/integration/resultsdb/Dockerfile index 3ec0d00aa2..572c26e655 100644 --- a/devel/ci/integration/resultsdb/Dockerfile +++ b/devel/ci/integration/resultsdb/Dockerfile @@ -1,4 +1,4 @@ -FROM registry.fedoraproject.org/fedora:32 +FROM registry.fedoraproject.org/fedora:latest LABEL \ name="resultsdb" \ vendor="Fedora Infrastructure" \