From a8fd02960c86c13161077817db59305847a2a1bb Mon Sep 17 00:00:00 2001
From: Federico Ressi <fressi@redhat.com>
Date: Mon, 31 Aug 2020 15:07:32 +0200
Subject: [PATCH] Ensure python-docutils package is installed

- Use IR fix for setuptools installation [1]
- Restore voting to 'tobiko-tox-infrared-centos-8' job

[1] https://review.gerrithub.io/c/redhat-openstack/infrared/+/501507

Change-Id: I04dafdae5cc62a4c470204e0ba816e9bde522aaf
---
 bindep.txt                            | 3 +++
 infrared_plugin/requirements.txt      | 6 ++++--
 roles/tests/test_infrared_plugin.yaml | 3 +++
 roles/tobiko-bindep/tasks/main.yaml   | 1 +
 zuul.d/infrared.yaml                  | 2 +-
 5 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/bindep.txt b/bindep.txt
index 52cd4ad67..1642e253f 100644
--- a/bindep.txt
+++ b/bindep.txt
@@ -9,8 +9,10 @@ iproute [platform:redhat]
 libffi-devel [platform:redhat]
 make [platform:redhat]
 openssl-devel [platform:redhat]
+python-docutils [platform:rhel-7]
 python3 [platform:redhat]
 python3-devel [platform:redhat !platform:rhel-7]
+python3-docutils [platform:redhat !platform:rhel-7]
 python3-libselinux [platform:redhat]
 python3-setuptools [platform:redhat]
 python3-wheel [platform:redhat]
@@ -24,5 +26,6 @@ git [platform:ubuntu]
 libffi-dev [platform:ubuntu]
 libssl-dev [platform:ubuntu]
 make [platform:ubuntu]
+python-docutils [platform:ubuntu]
 python3 [platform:ubuntu]
 python3-dev [platform:ubuntu]
diff --git a/infrared_plugin/requirements.txt b/infrared_plugin/requirements.txt
index 7f2140236..0a40aad51 100644
--- a/infrared_plugin/requirements.txt
+++ b/infrared_plugin/requirements.txt
@@ -1,2 +1,4 @@
-git+https://github.com/redhat-openstack/infrared.git ; python_version < '3.8'
-git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/12 ; python_version >= '3.8'
+# git+https://github.com/redhat-openstack/infrared.git ; python_version < '3.8'
+# git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/12 ; python_version >= '3.8'
+
+git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/07/501507/1
diff --git a/roles/tests/test_infrared_plugin.yaml b/roles/tests/test_infrared_plugin.yaml
index bba5ede0f..feec7aee8 100644
--- a/roles/tests/test_infrared_plugin.yaml
+++ b/roles/tests/test_infrared_plugin.yaml
@@ -5,6 +5,9 @@
     test_collect_dir: '{{ test_dir }}/test_results'
 
   roles:
+    - role: tobiko-bindep
+      vars:
+        bindep_file: '{{ test_dir }}/bindep.txt'
     - tobiko-ensure-tox
 
   tasks:
diff --git a/roles/tobiko-bindep/tasks/main.yaml b/roles/tobiko-bindep/tasks/main.yaml
index cf6156aac..0bf67f4a3 100644
--- a/roles/tobiko-bindep/tasks/main.yaml
+++ b/roles/tobiko-bindep/tasks/main.yaml
@@ -17,6 +17,7 @@
       command: >
         '{{ bindep_executable }}' -b -f '{{ bindep_file }}' {{ bindep_profile }}
       when:
+        - check_bindep_file.stat.exists
         - check_bindep_file.stat.readable
       register: run_bindep
       changed_when: no
diff --git a/zuul.d/infrared.yaml b/zuul.d/infrared.yaml
index af8e84f95..b90aeec0d 100644
--- a/zuul.d/infrared.yaml
+++ b/zuul.d/infrared.yaml
@@ -49,7 +49,7 @@
     name: tobiko-tox-infrared-centos-8
     parent: tobiko-tox-infrared
     nodeset: tobiko-centos-8-2-node
-    voting: false
+    voting: true
     description: |
       Run test cases using tobiko infrared plugin on CentOS 8