Add py27/35 postgresql unit tests to .zuul.yaml
This patchset adds py27/35 postgresql unit tests to .zuul.yaml; they use the pre-defined openstack-tox-py27|35 template defined in project-config as the parent. Change-Id: I572764417d98b6ab902fe2329cfb3b396ac38966
This commit is contained in:
parent
b8050a65ef
commit
0118874a4a
22
.zuul.yaml
22
.zuul.yaml
@ -13,6 +13,8 @@
|
|||||||
- project:
|
- project:
|
||||||
check:
|
check:
|
||||||
jobs:
|
jobs:
|
||||||
|
- airship-deckhand-tox-py27-postgresql
|
||||||
|
- airship-deckhand-tox-py35-postgresql
|
||||||
- airship-deckhand-linter
|
- airship-deckhand-linter
|
||||||
- airship-deckhand-ubuntu:
|
- airship-deckhand-ubuntu:
|
||||||
voting: false
|
voting: false
|
||||||
@ -21,6 +23,8 @@
|
|||||||
- airship-deckhand-integration-uwsgi-py35
|
- airship-deckhand-integration-uwsgi-py35
|
||||||
gate:
|
gate:
|
||||||
jobs:
|
jobs:
|
||||||
|
- airship-deckhand-tox-py27-postgresql
|
||||||
|
- airship-deckhand-tox-py35-postgresql
|
||||||
- airship-deckhand-linter
|
- airship-deckhand-linter
|
||||||
# NOTE(portdirect): enable when voting enabled.
|
# NOTE(portdirect): enable when voting enabled.
|
||||||
# - airship-deckhand-ubuntu:
|
# - airship-deckhand-ubuntu:
|
||||||
@ -32,6 +36,22 @@
|
|||||||
- airship-deckhand-functional-uwsgi-py35
|
- airship-deckhand-functional-uwsgi-py35
|
||||||
- airship-deckhand-integration-uwsgi-py35
|
- airship-deckhand-integration-uwsgi-py35
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: airship-deckhand-tox-py27-postgresql
|
||||||
|
parent: openstack-tox-py27
|
||||||
|
pre-run:
|
||||||
|
- tools/gate/playbooks/install-postgresql.yaml
|
||||||
|
vars:
|
||||||
|
tox_envlist: py27-postgresql
|
||||||
|
|
||||||
|
- job:
|
||||||
|
name: airship-deckhand-tox-py35-postgresql
|
||||||
|
parent: openstack-tox-py35
|
||||||
|
pre-run:
|
||||||
|
- tools/gate/playbooks/install-postgresql.yaml
|
||||||
|
vars:
|
||||||
|
tox_envlist: py35-postgresql
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: airship-deckhand-linter
|
name: airship-deckhand-linter
|
||||||
description: |
|
description: |
|
||||||
@ -90,6 +110,7 @@
|
|||||||
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.5.
|
||||||
|
timeout: 3600
|
||||||
run: tools/gate/playbooks/run-functional-tests-uwsgi.yaml
|
run: tools/gate/playbooks/run-functional-tests-uwsgi.yaml
|
||||||
nodeset: openstack-helm-single-node
|
nodeset: openstack-helm-single-node
|
||||||
vars:
|
vars:
|
||||||
@ -112,5 +133,6 @@
|
|||||||
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.5.
|
||||||
|
timeout: 3600
|
||||||
run: tools/gate/playbooks/run-integration-tests-uwsgi.yaml
|
run: tools/gate/playbooks/run-integration-tests-uwsgi.yaml
|
||||||
nodeset: openstack-helm-single-node
|
nodeset: openstack-helm-single-node
|
||||||
|
18
tools/gate/playbooks/install-postgresql.yaml
Normal file
18
tools/gate/playbooks/install-postgresql.yaml
Normal file
@ -0,0 +1,18 @@
|
|||||||
|
# Copyright 2018 AT&T Intellectual Property. All other rights reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
# you may not use this file except in compliance with the License.
|
||||||
|
# You may obtain a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
# See the License for the specific language governing permissions and
|
||||||
|
# limitations under the License.
|
||||||
|
|
||||||
|
- hosts: all
|
||||||
|
gather_facts: False
|
||||||
|
roles:
|
||||||
|
- install-postgresql
|
@ -4,7 +4,8 @@
|
|||||||
# upon test failure.
|
# upon test failure.
|
||||||
|
|
||||||
function cleanup {
|
function cleanup {
|
||||||
pifpaf_stop
|
set +e
|
||||||
|
pifpaf_stop || deactivate
|
||||||
}
|
}
|
||||||
|
|
||||||
trap cleanup EXIT
|
trap cleanup EXIT
|
||||||
|
Loading…
Reference in New Issue
Block a user