From d89b82ce765c194743fb17ce7491b4f42a150cf7 Mon Sep 17 00:00:00 2001 From: Nguyen Hai Date: Fri, 17 Aug 2018 19:20:25 +0900 Subject: [PATCH] import zuul job settings from project-config This is a mechanically generated patch to complete step 1 of moving the zuul job settings out of project-config and into each project repository. Because there will be a separate patch on each branch, the branch specifiers for branch-specific jobs have been removed. Because this patch is generated by a script, there may be some cosmetic changes to the layout of the YAML file(s) as the contents are normalized. See the python3-first goal document for details: https://governance.openstack.org/tc/goals/stein/python3-first.html Change-Id: Idfe602f9e94ae0adf4643f475a42b4681afb53e5 Story: #2002586 Task: #24310 --- .zuul.yaml | 5 +++++ tox.ini | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) create mode 100644 .zuul.yaml diff --git a/.zuul.yaml b/.zuul.yaml new file mode 100644 index 0000000..e3043f7 --- /dev/null +++ b/.zuul.yaml @@ -0,0 +1,5 @@ +- project: + templates: + - openstack-python-jobs + - openstack-python35-jobs-nonvoting + - check-requirements diff --git a/tox.ini b/tox.ini index c3c2f2a..d6af615 100644 --- a/tox.ini +++ b/tox.ini @@ -17,7 +17,7 @@ deps = -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} -r{toxinidir}/requirements.txt -r{toxinidir}/test-requirements.txt -commands = python manage.py test {posargs} --settings=masakaridashboard.test.settings --ignore-files=masakaridashboard/test/uuidsentinel.py +commands = python manage.py test {posargs} --settings=masakaridashboard.test.settings [testenv:pep8] commands = flake8 {posargs} @@ -36,7 +36,7 @@ commands = basepython = python2.7 commands = pip install django>=1.8,<1.9 - python manage.py test {posargs} --settings=masakaridashboard.test.settings --ignore-files=masakaridashboard/test/uuidsentinel.py + python manage.py test {posargs} --settings=masakaridashboard.test.settings [testenv:eslint] whitelist_externals = npm