From b5e51e2c292980cc7925f788823a4c191410eb97 Mon Sep 17 00:00:00 2001
From: ginger <ginger@redhat.com>
Date: Nov 30 2021 14:58:05 +0000
Subject: remove rpm-tests job and related playbook


---

diff --git a/playbooks/rpm/rpmtest.yaml b/playbooks/rpm/rpmtest.yaml
deleted file mode 100644
index dbd1fae..0000000
--- a/playbooks/rpm/rpmtest.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- hosts: all
-  roles:
-    - repo-setup
-    - extra-repos-setup
-    - repo-install-rpm
-    - run-tests-yml
-  pre_tasks:
-    - name: Force dnf to ipv4 only
-      become: true
-      lineinfile:
-        path: /etc/dnf/dnf.conf
-        insertafter: '^\[main\]'
-        line: "ip_resolve=4"
-    - name: Install STI system dependencies
-      yum:
-        name: standard-test-roles
-        state: latest
-        use_backend: "dnf"
-      become: true
diff --git a/zuul.d/jobs.dhall b/zuul.d/jobs.dhall
index 7f5127e..656a722 100644
--- a/zuul.d/jobs.dhall
+++ b/zuul.d/jobs.dhall
@@ -73,44 +73,6 @@ let createRpmInstallTestJob
 
         in  job
 
-let createRpmTestJob
-    : Branches.Type → Zuul.Job.Type
-    = λ(branch : Branches.Type) →
-        let getNodesetByBranch =
-              λ(branch : Branches.Type) →
-                merge
-                  { Rawhide =
-                      Nodesets.getName Nodesets.Type.Fedora-Rawhide-VM-Medium
-                  , F33 = Nodesets.getName Nodesets.Type.Fedora-33-VM-Medium
-                  , F34 = Nodesets.getName Nodesets.Type.Fedora-34-VM-Medium
-                  , F35 = Nodesets.getName Nodesets.Type.Fedora-35-VM-Medium
-                  , Epel8 = Nodesets.getName Nodesets.Type.Centos-8-VM
-                  }
-                  branch
-
-        let job =
-              Zuul.Job::{
-              , name = "rpm-test"
-              , description = Some
-                  "Install the built rpms and run STI tests (${Branches.show
-                                                                 branch} variant)"
-              , roles = Some [ { zuul = "zuul-distro-jobs" } ]
-              , timeout = Some 18000
-              , requires = Some [ "repo" ]
-              , run = Some "playbooks/rpm/rpmtest.yaml"
-              , post-run = Some [ "playbooks/rpm/rpmtest-fetch-artifacts.yaml" ]
-              , branches = Branches.zuulBranch branch
-              , nodeset = Some (getNodesetByBranch branch)
-              , vars = Some (createJobVars (Branches.kojirepos branch))
-              }
-
-        let job =
-              if    Branches.isEpel8 branch
-              then  job ⫽ { pre-run = Some [ "playbooks/epel8/install.yaml" ] }
-              else  job
-
-        in  job
-
 let createRpmInspectJob
     : Branches.Type → Zuul.Job.Type
     = λ(branch : Branches.Type) →
@@ -158,9 +120,6 @@ let rpm_install_test_jobs =
         createRpmInstallTestJob
         Branches.all
 
-let rpm_test_jobs =
-      Prelude.List.map Branches.Type Zuul.Job.Type createRpmTestJob Branches.all
-
 let rpminspect_jobs =
       Prelude.List.map
         Branches.Type
@@ -170,7 +129,6 @@ let rpminspect_jobs =
 
 let jobs =
         rpm_install_test_jobs
-      # rpm_test_jobs
       # rpminspect_jobs
       # [ rpm_linter_job ]
 
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index ec302a5..221831d 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -84,104 +84,6 @@
           url: https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/x86_64/
 
 - job:
-    name: rpm-test
-    description: "Install the built rpms and run STI tests (rawhide variant)"
-    run: playbooks/rpm/rpmtest.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - rawhide
-      - main
-    nodeset: fedora-rawhide-vm-medium
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/
-
-- job:
-    name: rpm-test
-    description: "Install the built rpms and run STI tests (f35 variant)"
-    run: playbooks/rpm/rpmtest.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - f35
-    nodeset: fedora-35-vm-medium
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f35-build/latest/x86_64/
-
-- job:
-    name: rpm-test
-    description: "Install the built rpms and run STI tests (f34 variant)"
-    run: playbooks/rpm/rpmtest.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - f34
-    nodeset: fedora-34-vm-medium
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f34-build/latest/x86_64/
-
-- job:
-    name: rpm-test
-    description: "Install the built rpms and run STI tests (f33 variant)"
-    run: playbooks/rpm/rpmtest.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - f33
-    nodeset: fedora-33-vm-medium
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f33-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:
-      - playbooks/epel8/install.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - epel8
-    nodeset: centos-8-vm
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/epel8-build/latest/x86_64/
-
-- job:
     name: rpm-rpminspect
     parent: rpminspect
     description: "Run the rpminspect report tests (rawhide variant)"