From d4b18155a448e969e18b53d089016a06592ba81b Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Wed, 3 Jun 2020 14:22:11 +0200 Subject: [PATCH] Remove python3-devel package from RHEL-7 bindeps This allows running InfraRed jobs against RHEL-7 hosts Test cases are going anyway to fail because python3-devel is actually required by Tobiko python dependencies. Romoving this package from dependencies helps fixing other issues before package lack is solved. Change-Id: I47aeae358652a7ee5618d8cec9dae01f872f5c40 --- bindep.txt | 2 +- roles/tests/vars/test-RedHat-7.yaml | 5 +++++ roles/tobiko-ensure-python3/vars/RedHat-7.yaml | 7 +++++++ 3 files changed, 13 insertions(+), 1 deletion(-) create mode 100644 roles/tests/vars/test-RedHat-7.yaml create mode 100644 roles/tobiko-ensure-python3/vars/RedHat-7.yaml diff --git a/bindep.txt b/bindep.txt index 605c28b6b..52cd4ad67 100644 --- a/bindep.txt +++ b/bindep.txt @@ -10,7 +10,7 @@ libffi-devel [platform:redhat] make [platform:redhat] openssl-devel [platform:redhat] python3 [platform:redhat] -python3-devel [platform:redhat] +python3-devel [platform:redhat !platform:rhel-7] python3-libselinux [platform:redhat] python3-setuptools [platform:redhat] python3-wheel [platform:redhat] diff --git a/roles/tests/vars/test-RedHat-7.yaml b/roles/tests/vars/test-RedHat-7.yaml new file mode 100644 index 000000000..e27174cf8 --- /dev/null +++ b/roles/tests/vars/test-RedHat-7.yaml @@ -0,0 +1,5 @@ +--- + +# This InfraRed patchset is required to workaround missing SE Linux Python 3 bindings +# https://review.gerrithub.io/c/redhat-openstack/infrared/+/493715 +ir_deps: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/15/493715/5" diff --git a/roles/tobiko-ensure-python3/vars/RedHat-7.yaml b/roles/tobiko-ensure-python3/vars/RedHat-7.yaml new file mode 100644 index 000000000..23f078745 --- /dev/null +++ b/roles/tobiko-ensure-python3/vars/RedHat-7.yaml @@ -0,0 +1,7 @@ +--- + +python_packages: + python3: + - python3 + python3.6: + - python36