Gate fixes: remove py35, make xenial non-voting
Update Zuul config and tox settings to not run python3.5 jobs, and to make the xenial image jobs non-voting. Change-Id: Icc9f71e60e6b48254917ea1d41ce9bc823cce512
This commit is contained in:
parent
e64f17b91b
commit
0b985d60a9
@ -13,7 +13,6 @@
|
|||||||
- project:
|
- project:
|
||||||
templates:
|
templates:
|
||||||
- docs-on-readthedocs
|
- docs-on-readthedocs
|
||||||
- openstack-python35-jobs
|
|
||||||
- openstack-python36-jobs
|
- openstack-python36-jobs
|
||||||
vars:
|
vars:
|
||||||
rtd_webhook_id: '38576'
|
rtd_webhook_id: '38576'
|
||||||
@ -88,6 +87,7 @@
|
|||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: airship-shipyard-image-gate-ubuntu_xenial
|
name: airship-shipyard-image-gate-ubuntu_xenial
|
||||||
|
voting: false
|
||||||
description: |
|
description: |
|
||||||
Run shipyard-image build for ubuntu_xenial.
|
Run shipyard-image build for ubuntu_xenial.
|
||||||
parent: airship-shipyard-image-base
|
parent: airship-shipyard-image-base
|
||||||
@ -146,6 +146,7 @@
|
|||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: airship-shipyard-docker-build-post-ubuntu_xenial
|
name: airship-shipyard-docker-build-post-ubuntu_xenial
|
||||||
|
voting: false
|
||||||
timeout: 1800
|
timeout: 1800
|
||||||
run: tools/gate/playbooks/run-image.yaml
|
run: tools/gate/playbooks/run-image.yaml
|
||||||
nodeset: airship-shipyard-single-node
|
nodeset: airship-shipyard-single-node
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[tox]
|
[tox]
|
||||||
skipsdist=True
|
skipsdist=True
|
||||||
envlist = py35, py36, pep8, bandit
|
envlist = py36, pep8, bandit
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv=
|
setenv=
|
||||||
@ -9,21 +9,6 @@ setenv=
|
|||||||
LC_ALL=C.UTF-8
|
LC_ALL=C.UTF-8
|
||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
|
|
||||||
[testenv:py35]
|
|
||||||
skipsdist=True
|
|
||||||
setenv=
|
|
||||||
SLUGIFY_USES_TEXT_UNIDECODE=yes
|
|
||||||
commands =
|
|
||||||
pip install -r{toxinidir}/test-requirements.txt
|
|
||||||
airflow initdb
|
|
||||||
pytest \
|
|
||||||
{posargs} \
|
|
||||||
--cov-branch \
|
|
||||||
--cov-report=term-missing:skip-covered \
|
|
||||||
--cov-config=.coveragerc \
|
|
||||||
--cov=shipyard_airflow \
|
|
||||||
--cov-report=html
|
|
||||||
|
|
||||||
[testenv:py36]
|
[testenv:py36]
|
||||||
skipsdist=True
|
skipsdist=True
|
||||||
setenv=
|
setenv=
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
[tox]
|
[tox]
|
||||||
skipsdist=True
|
skipsdist=True
|
||||||
envlist = py35, py36, pep8, bandit
|
envlist = py36, pep8, bandit
|
||||||
|
|
||||||
[testenv]
|
[testenv]
|
||||||
setenv=
|
setenv=
|
||||||
@ -10,17 +10,6 @@ setenv=
|
|||||||
deps = -r{toxinidir}/requirements.txt
|
deps = -r{toxinidir}/requirements.txt
|
||||||
-r{toxinidir}/test-requirements.txt
|
-r{toxinidir}/test-requirements.txt
|
||||||
|
|
||||||
[testenv:py35]
|
|
||||||
skipsdist=True
|
|
||||||
commands =
|
|
||||||
pytest \
|
|
||||||
{posargs} \
|
|
||||||
--cov-branch \
|
|
||||||
--cov-report=term-missing:skip-covered \
|
|
||||||
--cov-config=.coveragerc \
|
|
||||||
--cov=shipyard_client \
|
|
||||||
--cov-report=html
|
|
||||||
|
|
||||||
[testenv:py36]
|
[testenv:py36]
|
||||||
skipsdist=True
|
skipsdist=True
|
||||||
commands =
|
commands =
|
||||||
|
7
tox.ini
7
tox.ini
@ -34,13 +34,6 @@ commands=
|
|||||||
tox -c {toxinidir}/src/bin/shipyard_airflow/tox.ini
|
tox -c {toxinidir}/src/bin/shipyard_airflow/tox.ini
|
||||||
tox -c {toxinidir}/src/bin/shipyard_client/tox.ini
|
tox -c {toxinidir}/src/bin/shipyard_client/tox.ini
|
||||||
|
|
||||||
[testenv:py35]
|
|
||||||
whitelist_externals=
|
|
||||||
tox
|
|
||||||
commands=
|
|
||||||
tox -c {toxinidir}/src/bin/shipyard_airflow/tox.ini -e py35
|
|
||||||
tox -c {toxinidir}/src/bin/shipyard_client/tox.ini -e py35
|
|
||||||
|
|
||||||
[testenv:py36]
|
[testenv:py36]
|
||||||
whitelist_externals=
|
whitelist_externals=
|
||||||
tox
|
tox
|
||||||
|
Loading…
x
Reference in New Issue
Block a user