Browse Source

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
changes/49/749049/6
Federico Ressi 11 months ago
parent
commit
a8fd02960c
  1. 3
      bindep.txt
  2. 6
      infrared_plugin/requirements.txt
  3. 3
      roles/tests/test_infrared_plugin.yaml
  4. 1
      roles/tobiko-bindep/tasks/main.yaml
  5. 2
      zuul.d/infrared.yaml

3
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]

6
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

3
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:

1
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

2
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

Loading…
Cancel
Save