Drop Python 3.5, make xenial/opensuse non-voting

Update tox configuration and Zuul config to use Python 3.6, and make the
xenial and opensuse gates non-voting.

Change-Id: Iab98ad6cf269d57acf0598ae431b2f661673b234
This commit is contained in:
Phil Sphicas 2021-10-19 13:24:12 -07:00
parent 4ba85d2432
commit 7be8e1e6ac
5 changed files with 57 additions and 48 deletions

View File

@ -14,7 +14,7 @@
templates: templates:
- openstack-cover-jobs - openstack-cover-jobs
- docs-on-readthedocs - docs-on-readthedocs
- openstack-python35-jobs - openstack-python36-jobs
- openstack-python3-train-jobs - openstack-python3-train-jobs
- openstack-python3-ussuri-jobs - openstack-python3-ussuri-jobs
vars: vars:
@ -22,17 +22,15 @@
rtd_project_name: 'airship-deckhand' rtd_project_name: 'airship-deckhand'
check: check:
jobs: jobs:
- deckhand-tox-py35-postgresql - deckhand-tox-py36-postgresql
- deckhand-functional-uwsgi-py35: - deckhand-functional-uwsgi-py36
voting: true - deckhand-functional-docker-py36-ubuntu_xenial
- deckhand-functional-docker-py35-ubuntu_xenial - deckhand-functional-docker-py36-ubuntu_bionic
- deckhand-functional-docker-py35-ubuntu_bionic - deckhand-functional-docker-py36-opensuse
- deckhand-functional-docker-py35-opensuse - deckhand-integration-uwsgi-py36
- deckhand-integration-uwsgi-py35: - deckhand-integration-docker-py36-ubuntu_xenial
voting: true - deckhand-integration-docker-py36-ubuntu_bionic
- deckhand-integration-docker-py35-ubuntu_xenial - deckhand-integration-docker-py36-opensuse
- deckhand-integration-docker-py35-ubuntu_bionic
- deckhand-integration-docker-py35-opensuse
- deckhand-chart-build-gate - deckhand-chart-build-gate
- deckhand-chart-build-latest-htk - deckhand-chart-build-latest-htk
- deckhand-docker-build-gate-ubuntu_xenial - deckhand-docker-build-gate-ubuntu_xenial
@ -41,13 +39,13 @@
- deckhand-airskiff-deployment - deckhand-airskiff-deployment
gate: gate:
jobs: jobs:
- deckhand-tox-py35-postgresql - deckhand-tox-py36-postgresql
- deckhand-functional-docker-py35-ubuntu_xenial - deckhand-functional-docker-py36-ubuntu_xenial
- deckhand-functional-docker-py35-ubuntu_bionic - deckhand-functional-docker-py36-ubuntu_bionic
- deckhand-functional-docker-py35-opensuse - deckhand-functional-docker-py36-opensuse
- deckhand-integration-docker-py35-ubuntu_xenial - deckhand-integration-docker-py36-ubuntu_xenial
- deckhand-integration-docker-py35-ubuntu_bionic - deckhand-integration-docker-py36-ubuntu_bionic
- deckhand-integration-docker-py35-opensuse - deckhand-integration-docker-py36-opensuse
- deckhand-chart-build-gate - deckhand-chart-build-gate
- deckhand-docker-build-gate-ubuntu_xenial - deckhand-docker-build-gate-ubuntu_xenial
- deckhand-docker-build-gate-ubuntu_bionic - deckhand-docker-build-gate-ubuntu_bionic
@ -76,19 +74,19 @@
label: ubuntu-bionic label: ubuntu-bionic
- job: - job:
name: deckhand-tox-py35-postgresql name: deckhand-tox-py36-postgresql
parent: openstack-tox-py35 parent: openstack-tox-py36
pre-run: pre-run:
- tools/gate/playbooks/install-postgresql.yaml - tools/gate/playbooks/install-postgresql.yaml
vars: vars:
tox_envlist: py35-postgresql tox_envlist: py36-postgresql
- job: - job:
name: deckhand-functional-uwsgi-py35 name: deckhand-functional-uwsgi-py36
description: | description: |
Run tox-based functional tests for the Airship Deckhand project using a Run tox-based functional tests for the Airship Deckhand project using a
minimalistic deployment consisting of uwsgi for Deckhand API and pifpaf minimalistic deployment consisting of uwsgi for Deckhand API and pifpaf
for ephemeral PostgreSQL DB, under cPython version 3.5. for ephemeral PostgreSQL DB, under cPython version 3.6.
run: tools/gate/playbooks/run-functional-tests-uwsgi.yaml run: tools/gate/playbooks/run-functional-tests-uwsgi.yaml
nodeset: deckhand-single-node nodeset: deckhand-single-node
vars: vars:
@ -117,10 +115,11 @@
- openstack/openstack-helm-infra - openstack/openstack-helm-infra
- job: - job:
name: deckhand-functional-docker-py35-ubuntu_xenial name: deckhand-functional-docker-py36-ubuntu_xenial
voting: false
description: | description: |
Run tox-based functional tests for the Airship Deckhand project under Run tox-based functional tests for the Airship Deckhand project under
cPython version 3.5. Uses tox with the ``functional-py35`` environment. cPython version 3.6. Uses tox with the ``functional-py36`` environment.
Ubuntu (xenial) image is built and used. Ubuntu (xenial) image is built and used.
parent: deckhand-functional-docker-base parent: deckhand-functional-docker-base
nodeset: deckhand-single-node nodeset: deckhand-single-node
@ -131,10 +130,10 @@
irrelevant-files: *irrelevant-files irrelevant-files: *irrelevant-files
- job: - job:
name: deckhand-functional-docker-py35-ubuntu_bionic name: deckhand-functional-docker-py36-ubuntu_bionic
description: | description: |
Run tox-based functional tests for the Airship Deckhand project under Run tox-based functional tests for the Airship Deckhand project under
cPython version 3.5. Uses tox with the ``functional-py35`` environment. cPython version 3.6. Uses tox with the ``functional-py36`` environment.
Ubuntu (bionic) image is built and used. Ubuntu (bionic) image is built and used.
parent: deckhand-functional-docker-base parent: deckhand-functional-docker-base
nodeset: deckhand-single-node nodeset: deckhand-single-node
@ -145,10 +144,11 @@
irrelevant-files: *irrelevant-files irrelevant-files: *irrelevant-files
- job: - job:
name: deckhand-functional-docker-py35-opensuse name: deckhand-functional-docker-py36-opensuse
voting: false
description: | description: |
Run tox-based functional tests for the Airship Deckhand project under Run tox-based functional tests for the Airship Deckhand project under
cPython version 3.5. Uses tox with the ``functional-py35`` environment. cPython version 3.6. Uses tox with the ``functional-py36`` environment.
Opensuse image is built and used. Opensuse image is built and used.
parent: deckhand-functional-docker-base parent: deckhand-functional-docker-base
nodeset: deckhand-single-node nodeset: deckhand-single-node
@ -159,11 +159,11 @@
irrelevant-files: *irrelevant-files irrelevant-files: *irrelevant-files
- job: - job:
name: deckhand-integration-uwsgi-py35 name: deckhand-integration-uwsgi-py36
description: | description: |
Run tox-based integration tests for the Airship Deckhand project using a Run tox-based integration tests for the Airship Deckhand project using a
minimalistic deployment consisting of uwsgi for Deckhand API and pifpaf minimalistic deployment consisting of uwsgi for Deckhand API and pifpaf
for ephemeral PostgreSQL DB, under cPython version 3.5. for ephemeral PostgreSQL DB, under cPython version 3.6.
timeout: 3600 timeout: 3600
run: tools/gate/playbooks/run-integration-tests-uwsgi.yaml run: tools/gate/playbooks/run-integration-tests-uwsgi.yaml
nodeset: deckhand-single-node nodeset: deckhand-single-node
@ -214,10 +214,11 @@
- ^releasenotes/.*$ - ^releasenotes/.*$
- job: - job:
name: deckhand-integration-docker-py35-ubuntu_xenial name: deckhand-integration-docker-py36-ubuntu_xenial
voting: false
description: | description: |
Run tox-based integration tests for the Airship Deckhand project under Run tox-based integration tests for the Airship Deckhand project under
cPython version 3.5. Builds ubuntu (xenial) deckhand image. cPython version 3.6. Builds ubuntu (xenial) deckhand image.
parent: deckhand-integration-docker-base parent: deckhand-integration-docker-base
nodeset: openstack-helm-single-node nodeset: openstack-helm-single-node
vars: vars:
@ -225,10 +226,10 @@
distro: ubuntu_xenial distro: ubuntu_xenial
- job: - job:
name: deckhand-integration-docker-py35-ubuntu_bionic name: deckhand-integration-docker-py36-ubuntu_bionic
description: | description: |
Run tox-based integration tests for the Airship Deckhand project under Run tox-based integration tests for the Airship Deckhand project under
cPython version 3.5. Builds ubuntu (bionic) deckhand image. cPython version 3.6. Builds ubuntu (bionic) deckhand image.
parent: deckhand-integration-docker-base parent: deckhand-integration-docker-base
nodeset: openstack-helm-single-node nodeset: openstack-helm-single-node
vars: vars:
@ -237,6 +238,7 @@
- job: - job:
name: deckhand-airskiff-deployment name: deckhand-airskiff-deployment
voting: false
nodeset: deckhand-single-node-airskiff nodeset: deckhand-single-node-airskiff
description: | description: |
Deploy Memcached using Airskiff and submitted Deckhand changes. Deploy Memcached using Airskiff and submitted Deckhand changes.
@ -256,10 +258,11 @@
- ^releasenotes/.*$ - ^releasenotes/.*$
- job: - job:
name: deckhand-integration-docker-py35-opensuse name: deckhand-integration-docker-py36-opensuse
voting: false
description: | description: |
Run tox-based integration tests for the Airship Deckhand project under Run tox-based integration tests for the Airship Deckhand project under
cPython version 3.5. Builds opensuse deckhand image. cPython version 3.6. Builds opensuse deckhand image.
parent: deckhand-integration-docker-base parent: deckhand-integration-docker-base
nodeset: openstack-helm-single-node nodeset: openstack-helm-single-node
vars: vars:
@ -268,6 +271,7 @@
- job: - job:
name: deckhand-docker-build-gate-ubuntu_xenial name: deckhand-docker-build-gate-ubuntu_xenial
voting: false
timeout: 1800 timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: deckhand-single-node nodeset: deckhand-single-node
@ -300,6 +304,7 @@
- job: - job:
name: deckhand-docker-build-gate-opensuse name: deckhand-docker-build-gate-opensuse
voting: false
timeout: 1800 timeout: 1800
run: tools/gate/playbooks/docker-image-build.yaml run: tools/gate/playbooks/docker-image-build.yaml
nodeset: deckhand-single-node nodeset: deckhand-single-node
@ -313,6 +318,7 @@
- job: - job:
name: deckhand-docker-publish-ubuntu_xenial name: deckhand-docker-publish-ubuntu_xenial
voting: false
description: | description: |
Runs on every merge, unless files in a dictionary below are changed. Runs on every merge, unless files in a dictionary below are changed.
Builds and publishes container ubuntu images on quay.io with a set of tags Builds and publishes container ubuntu images on quay.io with a set of tags
@ -357,6 +363,7 @@
- job: - job:
name: deckhand-docker-publish-opensuse name: deckhand-docker-publish-opensuse
voting: false
description: | description: |
Runs on every merge, unless files in a dictionary below are changed. Runs on every merge, unless files in a dictionary below are changed.
Builds and publishes container opensuse images on quay.io with a set of tags Builds and publishes container opensuse images on quay.io with a set of tags
@ -379,6 +386,7 @@
- job: - job:
name: deckhand-docker-tag-ubuntu_xenial name: deckhand-docker-tag-ubuntu_xenial
voting: false
description: | description: |
Runs on every merge when files in a dictionalry below are changed, and Runs on every merge when files in a dictionalry below are changed, and
adds git commit id tag onto the ubuntu container image published on quay.io, adds git commit id tag onto the ubuntu container image published on quay.io,
@ -411,6 +419,7 @@
- job: - job:
name: deckhand-docker-tag-opensuse name: deckhand-docker-tag-opensuse
voting: false
description: | description: |
Runs on every merge when files in a dictionalry below are changed, and Runs on every merge when files in a dictionalry below are changed, and
adds git commit id tag onto the opensuse container image published on quay.io, adds git commit id tag onto the opensuse container image published on quay.io,

View File

@ -101,7 +101,7 @@ Deckhand strives to conform to the
Python Python
------ ------
The Deckhand code base lives under ``/deckhand``. Deckhand supports py35 through py37 The Deckhand code base lives under ``/deckhand``. Deckhand supports py36 through py37
versions of interpreters. versions of interpreters.
See :ref:`coding-guide` for more information on contribution guidelines. See :ref:`coding-guide` for more information on contribution guidelines.

View File

@ -57,17 +57,17 @@ Deckhand.
To run unit tests using SQLite, execute:: To run unit tests using SQLite, execute::
$ tox -epy35 $ tox -epy36
against a py35-backed environment, respectively. against a py36-backed environment, respectively.
To run unit tests using PostgreSQL, execute:: To run unit tests using PostgreSQL, execute::
$ tox -epy35-postgresql $ tox -epy36-postgresql
To run individual unit tests, run (for example):: To run individual unit tests, run (for example)::
$ tox -e py35 -- deckhand.tests.unit.db.test_revisions $ tox -e py36 -- deckhand.tests.unit.db.test_revisions
.. warning:: .. warning::
@ -167,7 +167,7 @@ Troubleshooting
$ sudo apt-get install tox -y $ sudo apt-get install tox -y
* For any errors related to running ``tox -e py35``: * For any errors related to running ``tox -e py36``:
Ensure that ``python3-dev`` is installed:: Ensure that ``python3-dev`` is installed::

View File

@ -226,7 +226,7 @@ To run the Python linter, execute::
To run unit tests, execute:: To run unit tests, execute::
$ tox -e py35 $ tox -e py36
To run the test coverage job:: To run the test coverage job::
@ -330,7 +330,7 @@ included beneath each bullet.
$ [sudo] apt-get install tox -y $ [sudo] apt-get install tox -y
* For any errors related to running ``tox -e py35``: * For any errors related to running ``tox -e py36``:
Ensure that ``python3-dev`` is installed:: Ensure that ``python3-dev`` is installed::

View File

@ -25,14 +25,14 @@ basepython=python3
commands = commands =
{posargs} {posargs}
[testenv:py35] [testenv:py36]
basepython = python3 basepython = python3
commands = commands =
{[testenv]commands} {[testenv]commands}
stestr run {posargs} stestr run {posargs}
stestr slowest stestr slowest
[testenv:py35-postgresql] [testenv:py36-postgresql]
basepython = python3 basepython = python3
commands = commands =
{[testenv]commands} {[testenv]commands}