From 5ad252c96f3831c1e4923b04f651a83562ca00e9 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Oct 26 2022 16:07:35 +0000
Subject: Remove rpm-test job from the test template


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 51184b1..89e40c3 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -102,125 +102,6 @@
           url: https://kojipkgs.fedoraproject.org/repos/epel9-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 (f37 variant)"
-    run: playbooks/rpm/rpmtest.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - f37
-    nodeset: fedora-37-vm-medium
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f37-build/latest/x86_64/
-
-- job:
-    name: rpm-test
-    description: "Install the built rpms and run STI tests (f36 variant)"
-    run: playbooks/rpm/rpmtest.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - f36
-    nodeset: fedora-36-vm-medium
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/f36-build/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 (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-test
-    description: "Install the built rpms and run STI tests (epel9 variant)"
-    run: playbooks/rpm/rpmtest.yaml
-    pre-run:
-      - playbooks/epel8/install.yaml
-    post-run:
-      - playbooks/rpm/rpmtest-fetch-artifacts.yaml
-    branches:
-      - epel9
-    nodeset: centos-stream-9-vm
-    requires:
-      - repo
-    roles:
-      - zuul: zuul-distro-jobs
-    timeout: 18000
-    vars:
-      repos:
-        - name: distro-build
-          url: https://kojipkgs.fedoraproject.org/repos/epel9-build/latest/x86_64/
-
-- job:
     name: rpm-rpminspect
     parent: rpminspect
     description: "Run the rpminspect report tests (rawhide variant)"
diff --git a/zuul.d/templates.yaml b/zuul.d/templates.yaml
index 36ad393..8f4c049 100644
--- a/zuul.d/templates.yaml
+++ b/zuul.d/templates.yaml
@@ -33,9 +33,6 @@
     name: test
     check:
       jobs:
-        - check-for-tests:
-            dependencies:
-              - rpm-scratch-build
         - check-for-sti-tests:
             dependencies:
               - rpm-scratch-build
@@ -45,10 +42,6 @@
         - rpm-install-test:
             dependencies:
               - rpm-scratch-build
-        - rpm-test:
-            dependencies:
-              - check-for-tests
-              - rpm-scratch-build
         - rpm-tmt-test:
             dependencies:
               - check-for-fmf-tests