Browse Source

Merge "Clean up role tests"

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

+ 0
- 8
tox.ini View File

@@ -101,14 +101,6 @@ commands =
101 101
     bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
102 102
 
103 103
 
104
-[testenv:ssl]
105
-setenv =
106
-    {[testenv]setenv}
107
-    ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True
108
-commands =
109
-    bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
110
-
111
-
112 104
 [testenv:linters]
113 105
 commands =
114 106
     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-designate-ssl-nv
18
-    parent: openstack-ansible-functional-ubuntu-xenial
19
-    voting: false
20
-    vars:
21
-      tox_env: ssl

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

@@ -20,14 +20,11 @@
20 20
       - release-notes-jobs-python3
21 21
     check:
22 22
       jobs:
23
-        - openstack-ansible-designate-ssl-nv
24 23
         - openstack-ansible-functional-distro_install-ubuntu-xenial
25
-          # NOTE(hwoarang) Centos7 is having some troubles with repo dependencies
26
-          # so disabling until it's investigated.
27
-        - openstack-ansible-functional-distro_install-centos-7:
28
-            voting: false
24
+        - openstack-ansible-functional-distro_install-centos-7
29 25
         - openstack-ansible-functional-distro_install-opensuse-423
30 26
     gate:
31 27
       jobs:
32 28
         - openstack-ansible-functional-distro_install-ubuntu-xenial
29
+        - openstack-ansible-functional-distro_install-centos-7
33 30
         - openstack-ansible-functional-distro_install-opensuse-423

Loading…
Cancel
Save