From a84c78515a8f9aba7e9edd087768f928202599a0 Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Mon, 31 May 2021 12:40:48 +0200
Subject: [PATCH] Restore CentOS 7 infrared job to test Podman 1.6 integration

Change-Id: Ibfe5c181b46b2738297a3bb84d285f25919dad04
---
 bindep.txt           |  1 +
 zuul.d/infrared.yaml | 30 ++++++++++++++++++++++--------
 zuul.d/project.yaml  |  3 ++-
 3 files changed, 25 insertions(+), 9 deletions(-)

diff --git a/bindep.txt b/bindep.txt
index 2bd062005..2337f4cab 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -11,6 +11,7 @@ libffi-devel [platform:redhat]
 libguestfs-tools-c [platform:redhat]
 make [platform:redhat]
 openssl-devel [platform:redhat]
+podman [platform:redhat]
 python-docutils [platform:rhel-7]
 python-docutils [platform:centos-7]
 python3 [platform:redhat]
diff --git a/zuul.d/infrared.yaml b/zuul.d/infrared.yaml
index f80fa746a..c579d2b7c 100644
--- a/zuul.d/infrared.yaml
+++ b/zuul.d/infrared.yaml
@@ -34,14 +34,6 @@
       - ^tobiko/tests/faults/
 
 
-- job:
-    name: tobiko-infrared-centos
-    parent: tobiko-infrared
-    nodeset: tobiko-infrared-centos
-    voting: false
-    description: |
-      Run test cases using tobiko infrared plugin on CentOS
-
 - nodeset:
     name: tobiko-infrared-centos
     nodes:
@@ -55,6 +47,28 @@
           - secondary
 
 
+- job:
+    name: tobiko-infrared-centos-7
+    parent: tobiko-infrared
+    nodeset: tobiko-infrared-centos-7
+    voting: true
+    description: |
+      Run test cases using tobiko infrared plugin on CentOS
+
+
+- nodeset:
+    name: tobiko-infrared-centos-7
+    nodes:
+      - name: primary
+        label: centos-7
+      - name: secondary
+        label: centos-7
+    groups:
+      - name: undercloud
+        nodes:
+          - secondary
+
+
 - job:
     name: tobiko-infrared-fedora
     parent: tobiko-infrared
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 41c05382c..02bedf314 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -17,13 +17,14 @@
     check: &check_pipeline
       jobs:
         - tobiko-infrared
+        - tobiko-infrared-centos-7
 
     gate: *check_pipeline
 
     periodic:
       jobs:
         - tobiko-infrared
-        - tobiko-infrared-centos
+        - tobiko-infrared-centos-7
         - tobiko-infrared-fedora
         - tobiko-infrared-ubuntu
         - tripleo-ci-centos-8-content-provider