Browse Source

Merge "zuul: Use zuul templates for unit tests"

changes/71/614471/1
Zuul 3 years ago
committed by Gerrit Code Review
parent
commit
70ec78815d
  1. 34
      .zuul.yaml
  2. 20
      tools/gate/playbooks/run-tests.yaml
  3. 15
      tools/gate/roles/run-tests/tasks/main.yaml
  4. 20
      tools/gate/roles/run-tests/tasks/tox-tests.yaml

34
.zuul.yaml

@ -13,6 +13,8 @@
- project:
templates:
- docs-on-readthedocs
- openstack-python35-jobs
- openstack-python36-jobs
vars:
rtd_webhook_id: '38576'
check:
@ -21,7 +23,6 @@
- airship-shipyard-linter
- airship-shipyard-ubuntu:
voting: false
- airship-shipyard-tox-py35
- airship-shipyard-image
gate:
jobs:
@ -33,7 +34,6 @@
# - ^.*\.rst$
# - ^doc/.*$
# - ^releasenotes/.*$
- airship-shipyard-tox-py35
- airship-shipyard-image
post:
jobs:
@ -75,36 +75,6 @@
parent: airship-shipyard-base
run: tools/gate/playbooks/airship-shipyard-check.yaml
- job:
name: airship-shipyard-tox-base
description: |
Base job for running airship-shipyard tests. Runs tests
against Docker image generated from source code.
roles:
- zuul: openstack/openstack-helm-infra
timeout: 3600
pre-run:
- tools/gate/playbooks/osh-infra-upgrade-host.yaml
- tools/gate/playbooks/osh-infra-deploy-docker.yaml
run: tools/gate/playbooks/run-tests.yaml
required-projects:
- openstack/openstack-helm-infra
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^releasenotes/.*$
- job:
name: airship-shipyard-tox-py35
description: |
Run tox-based tests for the Airship Shipyard project under
cPython version 3.5.
parent: airship-shipyard-tox-base
nodeset: airship-shipyard-single-node
vars:
tox_envlist: py35
- job:
name: airship-shipyard-image-base
description: |

20
tools/gate/playbooks/run-tests.yaml

@ -1,20 +0,0 @@
# 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:
- run-tests
tags:
- run-tests

15
tools/gate/roles/run-tests/tasks/main.yaml

@ -1,15 +0,0 @@
# 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.
- include: tox-tests.yaml

20
tools/gate/roles/run-tests/tasks/tox-tests.yaml

@ -1,20 +0,0 @@
# 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.
- name: Run Tox Tests
shell: |
set -xe;
tox -e {{ tox_envlist }}
args:
chdir: "{{ zuul.project.src_dir }}"
Loading…
Cancel
Save