From d259b94322b7d67d13dc53d71ccecc0244ddcd7d Mon Sep 17 00:00:00 2001
From: Ilya Shakhat <shakhat@gmail.com>
Date: Sun, 24 Jan 2021 21:14:36 +0400
Subject: [PATCH] Resolve job failures
* Pin versions of dependencies for py<3.6
* Use Ubuntu Bionic for intergration jobs
Change-Id: Idb5095e93df9e8261b670d1cc639b2bab4939980
---
.zuul.yaml | 2 ++
requirements.txt | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/.zuul.yaml b/.zuul.yaml
index 1c31e6b..6ab33ce 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -24,6 +24,7 @@
- job:
name: shaker-integration-py27
parent: openstack-tox
+ nodeset: ubuntu-bionic
description: |
Run integration tests under Python 2.7
@@ -34,6 +35,7 @@
- job:
name: shaker-integration-py36
parent: openstack-tox
+ nodeset: ubuntu-bionic
description: |
Run integration tests under Python 3.6
diff --git a/requirements.txt b/requirements.txt
index 2246367..74bcfe4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,7 +21,8 @@ oslo.serialization>=1.10.0;python_version>='3.6' # Apache-2.0
oslo.utils>=3.18.0,<4.0.0;python_version<'3.6' # Apache-2.0
oslo.utils>=3.18.0;python_version>='3.6' # Apache-2.0
pygal
-pykwalify
+pykwalify<1.8.0;python_version<'3.6'
+pykwalify;python_version>='3.6'
python-glanceclient>=2.5.0,<=3.0.0;python_version<'3.6' # Apache-2.0
python-glanceclient>=2.5.0;python_version>='3.6' # Apache-2.0
python-neutronclient>=5.1.0,<8.0.0;python_version<'3.6' # Apache-2.0