Browse Source

Merge "Clean up role tests"

Zuul 7 months ago
parent
commit
8abc885961
3 changed files with 2 additions and 32 deletions
  1. 0
    8
      tox.ini
  2. 0
    21
      zuul.d/jobs.yaml
  3. 2
    3
      zuul.d/project.yaml

+ 0
- 8
tox.ini View File

@@ -93,14 +93,6 @@ commands =
93 93
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
94 94
 
95 95
 
96
-[testenv:ssl]
97
-setenv =
98
-    {[testenv]setenv}
99
-    ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True
100
-commands =
101
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
102
-
103
-
104 96
 [testenv:linters]
105 97
 commands =
106 98
     bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"

+ 0
- 21
zuul.d/jobs.yaml View File

@@ -1,21 +0,0 @@
1
----
2
-# Copyright 2017, Rackspace US, Inc.
3
-#
4
-# Licensed under the Apache License, Version 2.0 (the "License");
5
-# you may not use this file except in compliance with the License.
6
-# You may obtain a copy of the License at
7
-#
8
-#     http://www.apache.org/licenses/LICENSE-2.0
9
-#
10
-# Unless required by applicable law or agreed to in writing, software
11
-# distributed under the License is distributed on an "AS IS" BASIS,
12
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13
-# See the License for the specific language governing permissions and
14
-# limitations under the License.
15
-
16
-- job:
17
-    name: openstack-ansible-magnum-ssl-nv
18
-    parent: openstack-ansible-functional-ubuntu-xenial
19
-    voting: false
20
-    vars:
21
-      tox_env: ssl

+ 2
- 3
zuul.d/project.yaml View File

@@ -22,16 +22,15 @@
22 22
         - openstack-ansible-linters
23 23
         - openstack-ansible-functional-centos-7:
24 24
             voting: false
25
-        - openstack-ansible-functional-opensuse-423:
26
-            voting: false
25
+        - openstack-ansible-functional-opensuse-423
27 26
         - openstack-ansible-functional-ubuntu-xenial
28 27
         - openstack-ansible-functional-ubuntu-bionic
29
-        - openstack-ansible-magnum-ssl-nv
30 28
     experimental:
31 29
       jobs:
32 30
         - openstack-ansible-integrated-deploy-aio
33 31
     gate:
34 32
       jobs:
35 33
         - openstack-ansible-linters
34
+        - openstack-ansible-functional-opensuse-423
36 35
         - openstack-ansible-functional-ubuntu-xenial
37 36
         - openstack-ansible-functional-ubuntu-bionic

Loading…
Cancel
Save