From 1702b42ff4e7959423561c0f9467e98814a346a0 Mon Sep 17 00:00:00 2001 From: Federico Ressi Date: Tue, 9 Jun 2020 12:02:43 +0200 Subject: [PATCH] Automaticall use Python 3.8 IR patch when required Change-Id: I71f02b9944c0a5d09e029a54625f0259c9fa9eaf --- infrared_plugin/requirements.txt | 3 ++- roles/tests/vars/test-Fedora-32.yaml | 3 --- roles/tests/vars/test-Ubuntu-20.04.yaml | 3 --- zuul.d/infrared.yaml | 8 -------- 4 files changed, 2 insertions(+), 15 deletions(-) delete mode 100644 roles/tests/vars/test-Fedora-32.yaml delete mode 100644 roles/tests/vars/test-Ubuntu-20.04.yaml diff --git a/infrared_plugin/requirements.txt b/infrared_plugin/requirements.txt index 08e70da83..ece74d658 100644 --- a/infrared_plugin/requirements.txt +++ b/infrared_plugin/requirements.txt @@ -1 +1,2 @@ -git+https://github.com/redhat-openstack/infrared.git # Apache-2.0 +git+https://github.com/redhat-openstack/infrared.git ; python_version < '3.8' +git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/9 ; python_version >= '3.8' diff --git a/roles/tests/vars/test-Fedora-32.yaml b/roles/tests/vars/test-Fedora-32.yaml deleted file mode 100644 index a5ec4c973..000000000 --- a/roles/tests/vars/test-Fedora-32.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -ir_deps: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/3" diff --git a/roles/tests/vars/test-Ubuntu-20.04.yaml b/roles/tests/vars/test-Ubuntu-20.04.yaml deleted file mode 100644 index a5ec4c973..000000000 --- a/roles/tests/vars/test-Ubuntu-20.04.yaml +++ /dev/null @@ -1,3 +0,0 @@ ---- - -ir_deps: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/3" diff --git a/zuul.d/infrared.yaml b/zuul.d/infrared.yaml index 2a06d66a3..68bec0228 100644 --- a/zuul.d/infrared.yaml +++ b/zuul.d/infrared.yaml @@ -64,10 +64,6 @@ voting: false description: | Run test cases using tobiko infrared plugin on Fedora 32 - vars: - tox_environment: - # This patchset fixes to use IR with Python 3.8 - IR_DEPS: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/5" - job: @@ -86,7 +82,3 @@ voting: false description: | Run test cases using tobiko infrared plugin on Ubuntu Focal - vars: - tox_environment: - # This patchset fixes to use IR with Python 3.8 - IR_DEPS: "git+https://review.gerrithub.io/redhat-openstack/infrared@refs/changes/23/493623/5"