From 1a5051cf9078539e16f8e6c48ee2754f38a7ca81 Mon Sep 17 00:00:00 2001 From: Fabien Boucher Date: Apr 30 2021 13:22:38 +0000 Subject: remove support for f32 To be merged Tue 2021-05-25 according to https://fedorapeople.org/groups/schedule/f-34/f-34-key-tasks.html --- diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall index 831eaf4..f7f54cf 100644 --- a/zuul.d/jobs.dhall +++ b/zuul.d/jobs.dhall @@ -46,7 +46,6 @@ let createRpmInstallTestJob λ(branch : Branches.Type) → merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM - , F32 = Nodesets.getName Nodesets.Type.Fedora-32-Container , F33 = Nodesets.getName Nodesets.Type.Fedora-33-Container , F34 = Nodesets.getName Nodesets.Type.Fedora-34-Container , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM @@ -81,7 +80,6 @@ let createRpmTestJob merge { Rawhide = Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium - , F32 = Nodesets.getName Nodesets.Type.Fedora-32-VM-Medium , F33 = Nodesets.getName Nodesets.Type.Fedora-33-VM-Medium , F34 = Nodesets.getName Nodesets.Type.Fedora-34-VM-Medium , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 019e794..e24276a 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -51,22 +51,6 @@ - job: name: rpm-install-test - description: "Install the built rpms (f32 variant)" - run: playbooks/rpm/rpm-install-test.yaml - branches: - - f32 - nodeset: fedora-32-container - requires: - - repo - roles: - - zuul: zuul-distro-jobs - vars: - repos: - - name: distro-build - url: https://kojipkgs.fedoraproject.org/repos/f32-build/latest/x86_64/ - -- job: - name: rpm-install-test description: "Install the built rpms (epel8 variant)" run: playbooks/rpm/rpm-install-test.yaml pre-run: @@ -143,25 +127,6 @@ - job: name: rpm-test - description: "Install the built rpms and run STI tests (f32 variant)" - run: playbooks/rpm/rpmtest.yaml - post-run: - - playbooks/rpm/rpmtest-fetch-artifacts.yaml - branches: - - f32 - nodeset: fedora-32-vm-medium - requires: - - repo - roles: - - zuul: zuul-distro-jobs - timeout: 18000 - vars: - repos: - - name: distro-build - url: https://kojipkgs.fedoraproject.org/repos/f32-build/latest/x86_64/ - -- job: - name: rpm-test description: "Install the built rpms and run STI tests (epel8 variant)" run: playbooks/rpm/rpmtest.yaml pre-run: @@ -227,20 +192,6 @@ - job: name: rpm-rpminspect parent: rpminspect - description: "Run the rpminspect report tests (f32 variant)" - branches: - - f32 - nodeset: fedora-33-container - requires: - - repo - vars: - check_previous_build_enabled: true - rpminspect_cmd: rpminspect-fedora - target: f32 - -- job: - name: rpm-rpminspect - parent: rpminspect description: "Run the rpminspect report tests (epel8 variant)" branches: - epel8 @@ -259,7 +210,6 @@ - rawhide - f34 - f33 - - f32 - epel8 - main nodeset: fedora-33-container