From 47471494a3e92cf5970e3a19029915bbc24787f5 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jul 29 2020 14:31:56 +0000
Subject: [PATCH 1/2] Add fedora-31-container nodeset


---

diff --git a/zuul.d/nodesets.yaml b/zuul.d/nodesets.yaml
index bdcd5fc..9b2cfe1 100644
--- a/zuul.d/nodesets.yaml
+++ b/zuul.d/nodesets.yaml
@@ -13,6 +13,12 @@
         label: pod-fedora-32
 
 - nodeset:
+    name: fedora-31-container
+    nodes:
+      - name: container
+        label: pod-fedora-31
+
+- nodeset:
     name: fedora-30-container
     nodes:
       - name: container

From 21b65bfba5574e99b0ed2435f2003346f7c33149 Mon Sep 17 00:00:00 2001
From: Fabien Boucher <fboucher@redhat.com>
Date: Jul 30 2020 09:44:46 +0000
Subject: [PATCH 2/2] Add new rpm-install-test into the test template


This change adds a job (rpm-install-test) that install
the built rpms on a test system. This job (enabled by
default but non-voting) ensure built packages are
installable on the matching Fedora system.

Test system for f31 and f32 are container. We still use
a VM for rawhide.

The check-for-tests job use zuul_return child_jobs to
select the dependent job to run:
- rpm-test: if a tests/tests.yml is discovered in the repo
- rpm-install-test: if no tests/tests.yml discovered.

Depends-on: https://pagure.io/zuul-distro-jobs/pull-request/69
Depends-on: https://pagure.io/fedora-zuul-jobs-config/pull-request/63

---

diff --git a/playbooks/rpm/rpm-install-test.yaml b/playbooks/rpm/rpm-install-test.yaml
new file mode 100644
index 0000000..1fe2354
--- /dev/null
+++ b/playbooks/rpm/rpm-install-test.yaml
@@ -0,0 +1,6 @@
+---
+- hosts: all
+  roles:
+    - repo-setup
+    - extra-repos-setup
+    - repo-install-rpm
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index 79c78c5..fed29c9 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -1,4 +1,46 @@
 ---
+### rpm-install-test ###
+- job:
+    name: base-rpm-install-test
+    description: Install the built rpms
+    roles:
+      - zuul: zuul-distro-jobs
+    requires: repo
+    run: playbooks/rpm/rpm-install-test.yaml
+    host-vars:
+      cloud-host:
+        ansible_python_interpreter: /usr/bin/python3
+
+- job:
+    name: rpm-install-test
+    parent: base-rpm-install-test
+    branches: master
+    nodeset: fedora-rawhide-vm
+    vars:
+      repos:
+        - name: rawhide-build
+          url: https://kojipkgs.fedoraproject.org/repos/rawhide/latest/x86_64/
+
+- job:
+    name: rpm-install-test
+    parent: base-rpm-install-test
+    branches: f32
+    nodeset: fedora-32-container
+    vars:
+      repos:
+        - name: f32-build
+          url: https://kojipkgs.fedoraproject.org/repos/f32-build/latest/x86_64/
+
+- job:
+    name: rpm-install-test
+    parent: base-rpm-install-test
+    branches: f31
+    nodeset: fedora-31-container
+    vars:
+      repos:
+        - name: f31-build
+          url: https://kojipkgs.fedoraproject.org/repos/f31-build/latest/x86_64/
+
 ### rpm-test ###
 - job:
     name: base-rpm-test
diff --git a/zuul.d/templates.yaml b/zuul.d/templates.yaml
index 9c106cc..7400f14 100644
--- a/zuul.d/templates.yaml
+++ b/zuul.d/templates.yaml
@@ -24,6 +24,11 @@
        - check-for-tests:
            dependencies:
              - rpm-scratch-build
+       - rpm-install-test:
+           voting: False
+           dependencies:
+             - check-for-tests
+             - rpm-scratch-build
        - rpm-test:
            dependencies:
              - check-for-tests