summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.com>2018-12-07 08:46:26 +0100
committerAndreas Jaeger <aj@suse.com>2018-12-07 08:49:55 +0100
commitf6f2699c782fe9b31d7783926714a37ebdbb6746 (patch)
tree9c1a890993eab4ee9d5c2f2820e9a08d797bf873
parentf91deab8fefdda38d4414f8cf602840655cfb0e0 (diff)
Cleanup running jobs
With the changed PTI doc building, this repo can now use the standard way of building docs, use publish-openstack-docs-pti template and remove custom jobs. Since this repo is not co-installed, it does not need requirements and lower-constraints - like none of the documentation projects. Remove these. Remove also lower-constraints tox environment and unused pip install command from tox.ini as the default is just fine. Remove passenv from docs environment, this is not needed with current CI jobs anymore. Change-Id: I52544b825d3de626f25a81acdb0f62e73771051a
Notes
Notes (review): Code-Review+2: Frank Kloeker <f.kloeker@telekom.de> Code-Review+2: Ian Y. Choi <ianyrchoi@gmail.com> Workflow+1: Ian Y. Choi <ianyrchoi@gmail.com> Verified+2: Zuul Submitted-by: Zuul Submitted-at: Mon, 17 Dec 2018 03:16:13 +0000 Reviewed-on: https://review.openstack.org/623414 Project: openstack/i18n Branch: refs/heads/master
-rw-r--r--.zuul.yaml22
-rw-r--r--lower-constraints.txt48
-rw-r--r--tox.ini10
3 files changed, 1 insertions, 79 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index c0f8c04..2baaeb6 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,29 +1,9 @@
1- job:
2 name: build-i18n-docs
3 description: |
4 openstack/i18n has a special doc build that does not match the normal
5 OpenStack PTI.
6 parent: tox-docs
7 vars:
8 tox_envlist: docs
9 tox_constraints_file: '{{ ansible_user_dir }}/src/git.openstack.org/openstack/requirements/upper-constraints.txt'
10 required-projects:
11 - openstack/requirements
12 success-url: html/
13
14- project: 1- project:
15 templates: 2 templates:
16 - check-requirements 3 - publish-openstack-docs-pti
17 check: 4 check:
18 jobs: 5 jobs:
19 - build-i18n-docs
20 - openstack-tox-lower-constraints
21 - openstack-tox-pep8 6 - openstack-tox-pep8
22 gate: 7 gate:
23 jobs: 8 jobs:
24 - build-i18n-docs
25 - openstack-tox-lower-constraints
26 - openstack-tox-pep8 9 - openstack-tox-pep8
27 post:
28 jobs:
29 - publish-openstack-tox-docs
diff --git a/lower-constraints.txt b/lower-constraints.txt
deleted file mode 100644
index 2cecedf..0000000
--- a/lower-constraints.txt
+++ /dev/null
@@ -1,48 +0,0 @@
1alabaster==0.7.10
2Babel==2.5.3
3beautifulsoup4==4.6.0
4certifi==2018.1.18
5chardet==3.0.4
6debtcollector==1.19.0
7doc8==0.8.0
8docutils==0.14
9dulwich==0.19.0
10flake8==2.2.4
11hacking==0.10.3
12idna==2.6
13imagesize==1.0.0
14iso8601==0.1.12
15Jinja2==2.10
16lxml==4.1.1
17MarkupSafe==1.0
18mccabe==0.2.1
19monotonic==1.4
20msgpack==0.5.6
21netaddr==0.7.19
22netifaces==0.10.6
23openstackdocstheme==1.28
24oslo.config==5.2.0
25oslo.context==2.20.0
26oslo.i18n==3.20.0
27oslo.log==3.37.0
28oslo.serialization==2.25.0
29oslo.utils==3.36.0
30pbr==3.1.1
31pep8==1.5.7
32pyflakes==0.8.1
33Pygments==2.2.0
34pyinotify==0.9.6
35pyparsing==2.2.0
36python-dateutil==2.7.0
37pytz==2018.3
38PyYAML==3.12
39requests==2.18.4
40restructuredtext-lint==1.1.3
41rfc3986==1.1.0
42six==1.11.0
43snowballstemmer==1.2.1
44Sphinx==1.6.5
45sphinxcontrib-websupport==1.0.1
46stevedore==1.28.0
47urllib3==1.22
48wrapt==1.10.11
diff --git a/tox.ini b/tox.ini
index af4bba9..119f59f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,6 @@ skipsdist = True
5 5
6[testenv] 6[testenv]
7basepython=python3 7basepython=python3
8#install_command = pip install -c{env:UPPER_CONSTRAINTS_FILE:https://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt} {opts} {packages}
9usedevelop = True 8usedevelop = True
10setenv = VIRTUAL_ENV={envdir} 9setenv = VIRTUAL_ENV={envdir}
11deps = -r{toxinidir}/requirements.txt 10deps = -r{toxinidir}/requirements.txt
@@ -24,9 +23,6 @@ commands = {posargs}
24commands = {posargs} 23commands = {posargs}
25 24
26[testenv:docs] 25[testenv:docs]
27passenv =
28 # Required by add-marker.sh
29 ZUUL*
30commands = 26commands =
31 doc8 doc/source 27 doc8 doc/source
32 # Build translated guides 28 # Build translated guides
@@ -59,9 +55,3 @@ max-line-length = 80
59# D000: Check RST validity 55# D000: Check RST validity
60# - cannot handle "none" for code-block directive 56# - cannot handle "none" for code-block directive
61ignore = D000 57ignore = D000
62
63[testenv:lower-constraints]
64deps =
65 -c{toxinidir}/lower-constraints.txt
66 -r{toxinidir}/test-requirements.txt
67 -r{toxinidir}/requirements.txt