Skip to content

Commit fddc922

Browse files
committed
Fix genconfig
Currently tox -e genconfig fails with stevedore issues, because tox is not doing sdist. Closes-Bug: #2051575 Change-Id: Idfc26fe380a546d0fd712a531e5913090b01d808 (cherry picked from commit d3bb06d)
1 parent efc4b72 commit fddc922

File tree

4 files changed

+34
-8
lines changed

4 files changed

+34
-8
lines changed

.zuul.d/project.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,3 +8,9 @@
88
- publish-openstack-docs-pti
99
- release-notes-jobs-python3
1010
- periodic-stable-jobs
11+
check:
12+
jobs:
13+
- kolla-tox-genconfig
14+
gate:
15+
jobs:
16+
- kolla-tox-genconfig

.zuul.d/tox.yaml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
- job:
3+
name: kolla-tox-genconfig
4+
parent: openstack-tox
5+
timeout: 2400
6+
description: |
7+
8+
Run genconfig
9+
10+
Uses tox with the ``genconfig`` environment.
11+
vars:
12+
tox_envlist: genconfig

kolla/common/config.py

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -296,20 +296,29 @@
296296

297297
def get_source_opts(type_=None, location=None, reference=None, enabled=True,
298298
version=None, sha256=None):
299-
return [cfg.StrOpt('type', choices=['local', 'git', 'url'],
299+
return [cfg.StrOpt('type',
300+
choices=['local', 'git', 'url'],
300301
default=type_,
301302
help='Source location type'),
302-
cfg.StrOpt('location', default=location,
303+
cfg.StrOpt('location',
304+
default=location,
303305
help='The location for source install'),
304-
cfg.StrOpt('reference', default=reference,
306+
cfg.StrOpt('reference',
307+
default=reference,
305308
help=('Git reference to pull, commit sha, tag '
306309
'or branch name')),
307-
cfg.BoolOpt('enabled', default=enabled,
310+
cfg.BoolOpt('enabled',
311+
default=enabled,
308312
help=('Whether the source is enabled')),
309-
cfg.StrOpt('version', default=version,
313+
cfg.StrOpt('version',
314+
default=version,
310315
help=('Package version to download for GitHub '
311316
'sources')),
312-
cfg.DictOpt('sha256', default=sha256)]
317+
cfg.DictOpt('sha256',
318+
default=sha256,
319+
help=('Dictionary of sha256 sums for GitHub '
320+
'sources')),
321+
]
313322

314323

315324
def get_user_opts(uid, gid, group):

tox.ini

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
[tox]
22
minversion = 3.18
3-
skipsdist = True
43
envlist = pep8,py310-{docker,podman}
54
ignore_basepython_conflict = True
65

76
[testenv]
87
basepython = python3
9-
usedevelop=True
8+
usedevelop = True
109
allowlist_externals = find
1110
rm
1211
deps = -c{env:TOX_CONSTRAINTS_FILE:https://releases.openstack.org/constraints/upper/2024.1}

0 commit comments

Comments
 (0)