summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-10-25 21:17:00 +0000
committerGerrit Code Review <review@openstack.org>2018-10-25 21:17:00 +0000
commit70ec78815dfc9deeb342a3fccfa3cd079a4312d9 (patch)
tree342a04cd806470b4c554ecc750056c994c6fdedd
parent4e9642cdaded3bf713d93e873d957279b13f2f57 (diff)
parentd3b282468faf09cc2a64ca41caa503a7e041c79d (diff)
Merge "zuul: Use zuul templates for unit tests"
-rw-r--r--.zuul.yaml34
-rw-r--r--tools/gate/playbooks/run-tests.yaml20
-rw-r--r--tools/gate/roles/run-tests/tasks/main.yaml15
-rw-r--r--tools/gate/roles/run-tests/tasks/tox-tests.yaml20
4 files changed, 2 insertions, 87 deletions
diff --git a/.zuul.yaml b/.zuul.yaml
index 5c8b522..df0bb4d 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -13,6 +13,8 @@
13- project: 13- project:
14 templates: 14 templates:
15 - docs-on-readthedocs 15 - docs-on-readthedocs
16 - openstack-python35-jobs
17 - openstack-python36-jobs
16 vars: 18 vars:
17 rtd_webhook_id: '38576' 19 rtd_webhook_id: '38576'
18 check: 20 check:
@@ -21,7 +23,6 @@
21 - airship-shipyard-linter 23 - airship-shipyard-linter
22 - airship-shipyard-ubuntu: 24 - airship-shipyard-ubuntu:
23 voting: false 25 voting: false
24 - airship-shipyard-tox-py35
25 - airship-shipyard-image 26 - airship-shipyard-image
26 gate: 27 gate:
27 jobs: 28 jobs:
@@ -33,7 +34,6 @@
33 # - ^.*\.rst$ 34 # - ^.*\.rst$
34 # - ^doc/.*$ 35 # - ^doc/.*$
35 # - ^releasenotes/.*$ 36 # - ^releasenotes/.*$
36 - airship-shipyard-tox-py35
37 - airship-shipyard-image 37 - airship-shipyard-image
38 post: 38 post:
39 jobs: 39 jobs:
@@ -75,36 +75,6 @@
75 parent: airship-shipyard-base 75 parent: airship-shipyard-base
76 run: tools/gate/playbooks/airship-shipyard-check.yaml 76 run: tools/gate/playbooks/airship-shipyard-check.yaml
77 77
78
79- job:
80 name: airship-shipyard-tox-base
81 description: |
82 Base job for running airship-shipyard tests. Runs tests
83 against Docker image generated from source code.
84 roles:
85 - zuul: openstack/openstack-helm-infra
86 timeout: 3600
87 pre-run:
88 - tools/gate/playbooks/osh-infra-upgrade-host.yaml
89 - tools/gate/playbooks/osh-infra-deploy-docker.yaml
90 run: tools/gate/playbooks/run-tests.yaml
91 required-projects:
92 - openstack/openstack-helm-infra
93 irrelevant-files:
94 - ^.*\.rst$
95 - ^doc/.*$
96 - ^releasenotes/.*$
97
98- job:
99 name: airship-shipyard-tox-py35
100 description: |
101 Run tox-based tests for the Airship Shipyard project under
102 cPython version 3.5.
103 parent: airship-shipyard-tox-base
104 nodeset: airship-shipyard-single-node
105 vars:
106 tox_envlist: py35
107
108- job: 78- job:
109 name: airship-shipyard-image-base 79 name: airship-shipyard-image-base
110 description: | 80 description: |
diff --git a/tools/gate/playbooks/run-tests.yaml b/tools/gate/playbooks/run-tests.yaml
deleted file mode 100644
index 7e79b2f..0000000
--- a/tools/gate/playbooks/run-tests.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
1# Copyright 2018 AT&T Intellectual Property. All other rights reserved.
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15- hosts: all
16 gather_facts: False
17 roles:
18 - run-tests
19 tags:
20 - run-tests
diff --git a/tools/gate/roles/run-tests/tasks/main.yaml b/tools/gate/roles/run-tests/tasks/main.yaml
deleted file mode 100644
index a1c8c12..0000000
--- a/tools/gate/roles/run-tests/tasks/main.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
1# Copyright 2018 AT&T Intellectual Property. All other rights reserved.
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15- include: tox-tests.yaml
diff --git a/tools/gate/roles/run-tests/tasks/tox-tests.yaml b/tools/gate/roles/run-tests/tasks/tox-tests.yaml
deleted file mode 100644
index 6153201..0000000
--- a/tools/gate/roles/run-tests/tasks/tox-tests.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
1# Copyright 2018 AT&T Intellectual Property. All other rights reserved.
2#
3# Licensed under the Apache License, Version 2.0 (the "License");
4# you may not use this file except in compliance with the License.
5# You may obtain a copy of the License at
6#
7# http://www.apache.org/licenses/LICENSE-2.0
8#
9# Unless required by applicable law or agreed to in writing, software
10# distributed under the License is distributed on an "AS IS" BASIS,
11# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12# See the License for the specific language governing permissions and
13# limitations under the License.
14
15- name: Run Tox Tests
16 shell: |
17 set -xe;
18 tox -e {{ tox_envlist }}
19 args:
20 chdir: "{{ zuul.project.src_dir }}"