zuul: Remove redundant airship-pegleg-tox-py36 job.

The openstack-python36-jobs template already exists; thus there
is no need for airship-pegleg-tox-py36. Since airship-pegleg-tox-py36
installs cfssl as a prerequisite for unit tests, move the install-cfssl.sh
command to tox.ini prior to unit test execution, allowing for the
airship-pegleg-tox-py36 Zuul job and its associated playbook to be
removed.

Change-Id: I66de957a1a57ef246476c1a81954cd0f822cb8be
This commit is contained in:
Felipe Monteiro 2019-03-03 11:46:44 -05:00
parent ca614beac7
commit 6c1b6e65b8
3 changed files with 2 additions and 39 deletions

View File

@ -18,13 +18,11 @@
check:
jobs:
- openstack-tox-pep8
- airship-pegleg-tox-py36
- airship-pegleg-doc-build
- airship-pegleg-docker-build-gate
gate:
jobs:
- openstack-tox-pep8
- airship-pegleg-tox-py36
- airship-pegleg-doc-build
- airship-pegleg-docker-build-gate
post:
@ -37,20 +35,6 @@
- name: primary
label: ubuntu-xenial
- job:
name: airship-pegleg-tox-py36
description: |
Executes unit tests under Python 3.6
parent: openstack-tox-py36
pre-run:
- tools/gate/playbooks/install-cfssl.yaml
irrelevant-files:
- ^.*\.rst$
- ^doc/.*$
- ^etc/.*$
- ^releasenotes/.*$
- ^setup.cfg$
- job:
name: airship-pegleg-doc-build
description: |

View File

@ -1,23 +0,0 @@
# Copyright 2018 AT&T Intellectual Property. All other rights reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
- hosts: all
gather_facts: False
tasks:
- name: Install cfssl for Ubuntu
shell: |-
./tools/install-cfssl.sh
become: yes
args:
chdir: "{{ zuul.project.src_dir }}"

View File

@ -14,9 +14,11 @@ deps =
-r{toxinidir}/test-requirements.txt
passenv = http_proxy https_proxy HTTP_PROXY HTTPS_PROXY no_proxy NO_PROXY PBR_VERSION
whitelist_externals =
bash
find
commands =
find . -type f -name "*.pyc" -delete
bash -c "{toxinidir}/tools/install-cfssl.sh"
{toxinidir}/tools/gate/run-unit-tests.sh '{posargs}'
[testenv:fmt]