From 6246f590061da714e752ad522f4c398d506732d3 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Oct 17 2019 15:44:34 +0000
Subject: Support of f31 and some slightly refactor


---

diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index bcc4e97..f125618 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,13 +1,18 @@
-# TODO(fbo): Should run on cloud-fedora-rawhide node
+---
+### rpm-test ###
 - job:
-    name: rpm-test
+    name: base-rpm-test
     description: Run the test.yml test
     parent: base-cloud-fedora-latest
-    branches: master
     roles:
       - zuul: zuul-distro-jobs
     requires: repo
     run: playbooks/rpm/rpmtest.yaml
+
+- job:
+    name: rpm-test
+    parent: base-rpm-test
+    branches: master
     nodeset: fedora-rawhide-vm
     host-vars:
       cloud-host:
@@ -15,13 +20,17 @@
 
 - job:
     name: rpm-test
-    description: Run the test.yml test
-    parent: base-cloud-fedora-latest
+    parent: base-rpm-test
+    branches: f31
+    nodeset: fedora-31-vm
+    host-vars:
+      cloud-host:
+        ansible_python_interpreter: /usr/bin/python3
+
+- job:
+    name: rpm-test
+    parent: base-rpm-test
     branches: f30
-    roles:
-      - zuul: zuul-distro-jobs
-    requires: repo
-    run: playbooks/rpm/rpmtest.yaml
     nodeset: fedora-30-vm
     host-vars:
       cloud-host:
@@ -29,19 +38,14 @@
 
 - job:
     name: rpm-test
-    description: Run the test.yml test
-    parent: base-cloud-fedora-latest
+    parent: base-rpm-test
     branches: f29
-    roles:
-      - zuul: zuul-distro-jobs
-    requires: repo
-    run: playbooks/rpm/rpmtest.yaml
     nodeset: fedora-29-vm
     host-vars:
       cloud-host:
         ansible_python_interpreter: /usr/bin/python3
 
-# TODO(fbo): Try variant to inherit from base-cloud-fedora-latest job
+### rpm-linter ###
 - job:
     name: rpm-linter
     parent: repo-rpm-lint
@@ -51,6 +55,7 @@
       cloud-host:
         ansible_python_interpreter: /usr/bin/python3
 
+### rpm-inspect ###
 - job:
     name: base-rpm-rpminspect
     parent: rpminspect
@@ -71,6 +76,14 @@
 - job:
     name: rpm-rpminspect
     parent: base-rpm-rpminspect
+    branches: f31
+    vars:
+      target: f31
+      check_previous_build_enabled: true
+
+- job:
+    name: rpm-rpminspect
+    parent: base-rpm-rpminspect
     branches: f30
     vars:
       target: f30
diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index b85eb5d..6747333 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -25,6 +25,12 @@
         label: cloud-fedora-30-small
 
 - nodeset:
+    name: fedora-31-vm
+    nodes:
+      - name: cloud-host
+        label: cloud-fedora-31-small
+
+- nodeset:
     name: fedora-30-vm
     nodes:
       - name: cloud-host