summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZuul <zuul@review.openstack.org>2018-09-10 17:18:12 +0000
committerGerrit Code Review <review@openstack.org>2018-09-10 17:18:12 +0000
commitb30b98020734e43e5c5b17ef032ef40a91419d86 (patch)
treeb76e01ad3e110c87db3aa643d9ea091aa7097ac5
parent1ccaa81bc7b12d637a1f6dcaa92ee5c66e9fbe9e (diff)
parentb8a64f6133324a371313bf1aed922a1f295483fb (diff)
Merge "Clean up role tests"
-rw-r--r--tox.ini8
-rw-r--r--zuul.d/jobs.yaml21
-rw-r--r--zuul.d/project.yaml3
3 files changed, 0 insertions, 32 deletions
diff --git a/tox.ini b/tox.ini
index db0d5e5..592d6a6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -89,14 +89,6 @@ commands =
89 bash -c "{toxinidir}/tests/common/test-ansible-functional.sh" 89 bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
90 90
91 91
92[testenv:ssl]
93setenv =
94 {[testenv]setenv}
95 ANSIBLE_PARAMETERS=-vvv -e galera_use_ssl=True
96commands =
97 bash -c "{toxinidir}/tests/common/test-ansible-functional.sh"
98
99
100[testenv:linters] 92[testenv:linters]
101commands = 93commands =
102 bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh" 94 bash -c "{toxinidir}/tests/common/test-ansible-env-prep.sh"
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
deleted file mode 100644
index 5ae154a..0000000
--- a/zuul.d/jobs.yaml
+++ /dev/null
@@ -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-gnocchi-ssl-nv
18 parent: openstack-ansible-functional-ubuntu-xenial
19 voting: false
20 vars:
21 tox_env: ssl
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index d52075f..e4b8357 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -18,6 +18,3 @@
18 - check-requirements 18 - check-requirements
19 - publish-openstack-docs-pti 19 - publish-openstack-docs-pti
20 - release-notes-jobs-python3 20 - release-notes-jobs-python3
21 check:
22 jobs:
23 - openstack-ansible-gnocchi-ssl-nv