Add .gitreview defaultbranch to fix issue with duplicate tags
As described in related bug the last three tags 13.0.0 wallaby 12.0.0 victoria and 11.0.2 Ussuri were pointing to the same commit. This creates a new commit so we can tag that instead. Updates test-requirements to fix issue seen at [1] and then fixes pep8 issues seen after that. [1] https://zuul.opendev.org/t/openstack/build/c228eba0043943a3bd5a336b0aca8773 Related-Bug: 1918311 Change-Id: I03f1cd324a51843e68b77dec7268c068704231a2
This commit is contained in:
parent
cc519a7d48
commit
177669bd87
|
@ -2,3 +2,4 @@
|
|||
host=review.opendev.org
|
||||
port=29418
|
||||
project=openstack/os-collect-config.git
|
||||
defaultbranch=master
|
||||
|
|
|
@ -64,8 +64,8 @@ class Collector(object):
|
|||
|
||||
def collect(self):
|
||||
if CONF.cfn.metadata_url is None:
|
||||
if (CONF.cfn.heat_metadata_hint
|
||||
and os.path.exists(CONF.cfn.heat_metadata_hint)):
|
||||
if (CONF.cfn.heat_metadata_hint and os.path.exists(
|
||||
CONF.cfn.heat_metadata_hint)):
|
||||
with open(CONF.cfn.heat_metadata_hint) as hint:
|
||||
CONF.cfn.metadata_url = '%s/v1/' % hint.read().strip()
|
||||
else:
|
||||
|
|
|
@ -74,7 +74,7 @@ class TestConfigDrive(testtools.TestCase):
|
|||
self.assertEqual(('foo', 'bar'), psv('foo=bar'))
|
||||
self.assertEqual(('foo', 'bar=baz'), psv('foo=bar=baz'))
|
||||
self.assertEqual(('foo', 'bar baz'), psv('foo=bar baz'))
|
||||
self.assertEqual(('foo', 'bar baz'), psv('foo=bar\ baz'))
|
||||
self.assertEqual(('foo', 'bar baz'), psv('foo=bar\ baz')) # noqa W605
|
||||
self.assertEqual(('foo', ''), psv('foo='))
|
||||
self.assertEqual((None, None), psv('foo'))
|
||||
self.assertEqual((None, None), psv(None))
|
||||
|
|
|
@ -156,8 +156,8 @@ class TestHeat(TestHeatBase):
|
|||
# FIXME(yanyanhu): Temporary hack to deal with possible log
|
||||
# level setting for urllib3.connectionpool.
|
||||
self.assertTrue(
|
||||
self.log.output == '' or
|
||||
self.log.output == 'Starting new HTTP connection (1): 192.0.2.1\n')
|
||||
self.log.output == '' or self.log.output == (
|
||||
'Starting new HTTP connection (1): 192.0.2.1\n'))
|
||||
|
||||
def test_collect_heat_fail(self):
|
||||
heat_collect = heat.Collector(
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
# The order of packages is significant, because pip processes them in the order
|
||||
# of appearance. Changing the order has an impact on the overall integration
|
||||
# process, which may cause wedges in the gate later.
|
||||
hacking!=0.13.0,<0.14,>=0.12.0 # Apache-2.0
|
||||
|
||||
hacking>=3.0.1,<3.1.0 # Apache-2.0
|
||||
coverage!=4.4,>=4.0 # Apache-2.0
|
||||
fixtures>=3.0.0 # Apache-2.0/BSD
|
||||
python-subunit>=1.0.0 # Apache-2.0/BSD
|
||||
|
@ -10,4 +10,4 @@ sphinx!=1.6.6,!=1.6.7,!=2.1.0,>=1.6.2 # BSD
|
|||
stestr>=2.0.0 # Apache-2.0
|
||||
testscenarios>=0.4 # Apache-2.0/BSD
|
||||
testtools>=2.2.0 # MIT
|
||||
pyflakes>=2.2.0
|
||||
pyflakes
|
||||
|
|
Loading…
Reference in New Issue