Browse Source

Merge "zuul: Use zuul templates for unit tests"

Zuul 5 months ago
parent
commit
70ec78815d

+ 2
- 32
.zuul.yaml View File

@@ -13,6 +13,8 @@
13 13
 - project:
14 14
     templates:
15 15
       - docs-on-readthedocs
16
+      - openstack-python35-jobs
17
+      - openstack-python36-jobs
16 18
     vars:
17 19
       rtd_webhook_id: '38576'
18 20
     check:
@@ -21,7 +23,6 @@
21 23
         - airship-shipyard-linter
22 24
         - airship-shipyard-ubuntu:
23 25
             voting: false
24
-        - airship-shipyard-tox-py35
25 26
         - airship-shipyard-image
26 27
     gate:
27 28
       jobs:
@@ -33,7 +34,6 @@
33 34
         #       - ^.*\.rst$
34 35
         #       - ^doc/.*$
35 36
         #       - ^releasenotes/.*$
36
-        - airship-shipyard-tox-py35
37 37
         - airship-shipyard-image
38 38
     post:
39 39
       jobs:
@@ -75,36 +75,6 @@
75 75
     parent: airship-shipyard-base
76 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 78
 - job:
109 79
     name: airship-shipyard-image-base
110 80
     description: |

+ 0
- 20
tools/gate/playbooks/run-tests.yaml View File

@@ -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

+ 0
- 15
tools/gate/roles/run-tests/tasks/main.yaml View File

@@ -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

+ 0
- 20
tools/gate/roles/run-tests/tasks/tox-tests.yaml View File

@@ -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 }}"

Loading…
Cancel
Save