From f016d8433fbed719981cc0ec66ecb4cd3ab58cff Mon Sep 17 00:00:00 2001 From: Shachar Snapiri Date: Tue, 18 Dec 2018 09:01:43 +0200 Subject: [PATCH] Fix lower_constraints - six verison should be bigger Builds fail due to autobahn using newer six package. We should use version 1.11.0 instead of 1.10.0. GateFix: Fix the scenario test gates We use a hardcoded string to describe the test image name. A recent patch[1] changed the deployed image to cirros-0.3.6-x86_64-disk. This change updates the hard-coded string. A future patch may add this to configuration. This patch is to fix the gate. [1] https://review.openstack.org/624716 Change-Id: If174ec2e8999fa824e2cc7938d1e7441864efecd --- dragonflow/tests/fullstack/test_objects.py | 2 +- lower-constraints.txt | 2 +- requirements.txt | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dragonflow/tests/fullstack/test_objects.py b/dragonflow/tests/fullstack/test_objects.py index b0b7415a5..5a3fab2dc 100644 --- a/dragonflow/tests/fullstack/test_objects.py +++ b/dragonflow/tests/fullstack/test_objects.py @@ -290,7 +290,7 @@ class VMTestObj(object): def create(self, network=None, script=None, security_groups=None, net_address=None): - image = self.nova.glance.find_image("cirros-0.3.5-x86_64-disk") + image = self.nova.glance.find_image("cirros-0.3.6-x86_64-disk") self.parent.assertIsNotNone(image) flavor = self.nova.flavors.find(name="m1.tiny") self.parent.assertIsNotNone(flavor) diff --git a/lower-constraints.txt b/lower-constraints.txt index 5d18e6f38..79b2cb284 100644 --- a/lower-constraints.txt +++ b/lower-constraints.txt @@ -132,7 +132,7 @@ rfc3986==1.1.0 Routes==2.4.1 ryu==4.24 simplejson==3.13.2 -six==1.10.0 +six==1.11.0 skydive-client==0.4.5 snowballstemmer==1.2.1 Sphinx==1.6.5 diff --git a/requirements.txt b/requirements.txt index 332de124a..63b75cfd4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -23,7 +23,7 @@ oslo.upgradecheck>=0.1.0 # Apache-2.0 ovsdbapp>=0.11.0 # Apache-2.0 crc16>=0.1.1 # LGPLv3+ netaddr>=0.7.18 # BSD -six>=1.10.0 # MIT +six>=1.11.0 # MIT httplib2>=0.9.1 # MIT WebOb>=1.7.1 # MIT jsonmodels>=2.1.5 # BSD License (3 clause)