Revert "Import the json_error callback from tripleo-common"
This reverts commit dc2e57b4290fa63e87b3ec8601ca909473503e12. This broke building because tripleo-common provides json_error.py Change-Id: I11f04f8128263af5932eef6c172e7d16091deb35
This commit is contained in:
parent
dc2e57b429
commit
8ebd012abc
@ -1,15 +0,0 @@
|
|||||||
===============================================
|
|
||||||
TripleO-Ansible Role - test_json_error_callback
|
|
||||||
===============================================
|
|
||||||
|
|
||||||
This role provides for the following services:
|
|
||||||
|
|
||||||
* test_json_error_callback
|
|
||||||
|
|
||||||
|
|
||||||
Example playbook
|
|
||||||
~~~~~~~~~~~~~~~~
|
|
||||||
|
|
||||||
.. literalinclude:: ../../../tripleo_ansible/roles/test_json_error_callback/molecule/default/playbook.yml
|
|
||||||
:language: yaml
|
|
||||||
:start-after: under the License.
|
|
11
tox.ini
11
tox.ini
@ -127,17 +127,6 @@ envdir = {toxworkdir}/mol
|
|||||||
commands =
|
commands =
|
||||||
python -m pytest --color=yes --html={envlogdir}/reports.html --self-contained-html {tty:-s} {toxinidir}/tests/test_molecule.py
|
python -m pytest --color=yes --html={envlogdir}/reports.html --self-contained-html {tty:-s} {toxinidir}/tests/test_molecule.py
|
||||||
|
|
||||||
[testenv:mol-test_json_error_callback]
|
|
||||||
setenv =
|
|
||||||
{[testenv]setenv}
|
|
||||||
JSON_ERROR_LOG_FILE=/tmp/json_error.log
|
|
||||||
ANSIBLE_LOAD_CALLBACK_PLUGINS=true
|
|
||||||
ANSIBLE_CALLBACK_WHITELIST=json_error
|
|
||||||
basepython = {[testenv:mol]basepython}
|
|
||||||
deps = {[testenv:mol]deps}
|
|
||||||
changedir = {toxinidir}/tripleo_ansible/roles/test_json_error_callback
|
|
||||||
commands = python -m pytest --color=yes --html={envlogdir}/reports.html --self-contained-html {tty:-s} {toxinidir}/tests/test_molecule.py
|
|
||||||
|
|
||||||
[testenv:mol-test_package_action]
|
[testenv:mol-test_package_action]
|
||||||
basepython = {[testenv:mol]basepython}
|
basepython = {[testenv:mol]basepython}
|
||||||
deps = {[testenv:mol]deps}
|
deps = {[testenv:mol]deps}
|
||||||
|
0
tripleo_ansible/ansible_plugins/callback/.gitkeep
Normal file
0
tripleo_ansible/ansible_plugins/callback/.gitkeep
Normal file
@ -1,59 +0,0 @@
|
|||||||
# Copyright 2018 Red Hat, Inc.
|
|
||||||
# All 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.
|
|
||||||
|
|
||||||
# Ansible has another callback plugin just called "json.py", which overrides
|
|
||||||
# a normal import of "import json", so use absolute imports
|
|
||||||
from __future__ import absolute_import
|
|
||||||
import json
|
|
||||||
import os
|
|
||||||
|
|
||||||
from ansible.plugins.callback import CallbackBase
|
|
||||||
|
|
||||||
|
|
||||||
DOCUMENTATION = '''
|
|
||||||
callback: json_error
|
|
||||||
short_description: Write errors in JSON format to a log file
|
|
||||||
description:
|
|
||||||
- This callback writes errors in JSON format to a log file
|
|
||||||
type: aggregate
|
|
||||||
options:
|
|
||||||
output_dir:
|
|
||||||
name: json-error log file
|
|
||||||
default: ansible-error.json
|
|
||||||
description: Log file where to write errors in JSON format.
|
|
||||||
env:
|
|
||||||
- name: JSON_ERROR_LOG_FILE
|
|
||||||
'''
|
|
||||||
|
|
||||||
|
|
||||||
class CallbackModule(CallbackBase):
|
|
||||||
CALLBACK_VERSION = 2.5
|
|
||||||
CALLBACK_TYPE = 'aggregate'
|
|
||||||
CALLBACK_NAME = 'json-error'
|
|
||||||
|
|
||||||
def __init__(self, display=None):
|
|
||||||
super(CallbackModule, self).__init__(display)
|
|
||||||
self.errors = {}
|
|
||||||
self.log_file = os.getenv(
|
|
||||||
'JSON_ERROR_LOG_FILE', 'ansible-errors.json')
|
|
||||||
|
|
||||||
def v2_playbook_on_stats(self, stats):
|
|
||||||
with open(self.log_file, 'w') as f:
|
|
||||||
f.write(json.dumps(self.errors))
|
|
||||||
|
|
||||||
def v2_runner_on_failed(self, result, ignore_errors=False):
|
|
||||||
if not ignore_errors:
|
|
||||||
host_errors = self.errors.setdefault(result._host.name, [])
|
|
||||||
host_errors.append((result.task_name, result._result))
|
|
@ -1,4 +0,0 @@
|
|||||||
test_json_error_callback
|
|
||||||
========================
|
|
||||||
|
|
||||||
Role to test the json_error callback plugin.
|
|
@ -1,44 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2019 Red Hat, Inc.
|
|
||||||
# All 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.
|
|
||||||
|
|
||||||
|
|
||||||
galaxy_info:
|
|
||||||
author: OpenStack
|
|
||||||
description: TripleO OpenStack Role -- test_json_error_callback
|
|
||||||
company: Red Hat
|
|
||||||
license: Apache-2.0
|
|
||||||
min_ansible_version: 2.7
|
|
||||||
#
|
|
||||||
# Provide a list of supported platforms, and for each platform a list of versions.
|
|
||||||
# If you don't wish to enumerate all versions for a particular platform, use 'all'.
|
|
||||||
# To view available platforms and versions (or releases), visit:
|
|
||||||
# https://galaxy.ansible.com/api/v1/platforms/
|
|
||||||
#
|
|
||||||
platforms:
|
|
||||||
- name: Fedora
|
|
||||||
versions:
|
|
||||||
- 28
|
|
||||||
- name: CentOS
|
|
||||||
versions:
|
|
||||||
- 7
|
|
||||||
|
|
||||||
galaxy_tags:
|
|
||||||
- tripleo
|
|
||||||
|
|
||||||
|
|
||||||
# List your role dependencies here, one per line. Be sure to remove the '[]' above,
|
|
||||||
# if you add dependencies to this list.
|
|
||||||
dependencies: []
|
|
@ -1,37 +0,0 @@
|
|||||||
# Molecule managed
|
|
||||||
# Copyright 2019 Red Hat, Inc.
|
|
||||||
# All 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.
|
|
||||||
|
|
||||||
|
|
||||||
{% if item.registry is defined %}
|
|
||||||
FROM {{ item.registry.url }}/{{ item.image }}
|
|
||||||
{% else %}
|
|
||||||
FROM {{ item.image }}
|
|
||||||
{% endif %}
|
|
||||||
|
|
||||||
RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
|
|
||||||
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install python sudo python-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
|
|
||||||
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
|
|
||||||
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
|
|
||||||
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \
|
|
||||||
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi
|
|
||||||
|
|
||||||
{% for pkg in item.easy_install | default([]) %}
|
|
||||||
# install pip for centos where there is no python-pip rpm in default repos
|
|
||||||
RUN easy_install {{ pkg }}
|
|
||||||
{% endfor %}
|
|
||||||
|
|
||||||
|
|
||||||
CMD ["sh", "-c", "while true; do sleep 10000; done"]
|
|
@ -1,52 +0,0 @@
|
|||||||
---
|
|
||||||
driver:
|
|
||||||
name: docker
|
|
||||||
|
|
||||||
log: true
|
|
||||||
|
|
||||||
platforms:
|
|
||||||
- name: centos7
|
|
||||||
hostname: centos7
|
|
||||||
image: centos:7
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
pkg_extras: python-setuptools
|
|
||||||
easy_install:
|
|
||||||
- pip
|
|
||||||
environment: &env
|
|
||||||
http_proxy: "{{ lookup('env', 'http_proxy') }}"
|
|
||||||
https_proxy: "{{ lookup('env', 'https_proxy') }}"
|
|
||||||
volumes:
|
|
||||||
- /tmp:/tmp
|
|
||||||
|
|
||||||
- name: fedora28
|
|
||||||
hostname: fedora28
|
|
||||||
image: fedora:28
|
|
||||||
dockerfile: Dockerfile
|
|
||||||
pkg_extras: python*-setuptools
|
|
||||||
environment:
|
|
||||||
<<: *env
|
|
||||||
volumes:
|
|
||||||
- /tmp:/tmp
|
|
||||||
|
|
||||||
provisioner:
|
|
||||||
name: ansible
|
|
||||||
log: true
|
|
||||||
env:
|
|
||||||
ANSIBLE_STDOUT_CALLBACK: yaml
|
|
||||||
|
|
||||||
scenario:
|
|
||||||
test_sequence:
|
|
||||||
- destroy
|
|
||||||
- create
|
|
||||||
- prepare
|
|
||||||
- converge
|
|
||||||
- verify
|
|
||||||
- destroy
|
|
||||||
|
|
||||||
lint:
|
|
||||||
enabled: false
|
|
||||||
|
|
||||||
verifier:
|
|
||||||
name: testinfra
|
|
||||||
lint:
|
|
||||||
name: flake8
|
|
@ -1,21 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2019 Red Hat, Inc.
|
|
||||||
# All 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.
|
|
||||||
|
|
||||||
|
|
||||||
- name: Converge
|
|
||||||
hosts: all
|
|
||||||
roles:
|
|
||||||
- role: "test_json_error_callback"
|
|
@ -1,21 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2019 Red Hat, Inc.
|
|
||||||
# All 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.
|
|
||||||
|
|
||||||
|
|
||||||
- name: Prepare
|
|
||||||
hosts: all
|
|
||||||
roles:
|
|
||||||
- role: test_deps
|
|
@ -1,27 +0,0 @@
|
|||||||
# Copyright 2019 Red Hat, Inc.
|
|
||||||
# All 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.
|
|
||||||
|
|
||||||
|
|
||||||
import os
|
|
||||||
|
|
||||||
import testinfra.utils.ansible_runner
|
|
||||||
|
|
||||||
|
|
||||||
testinfra_hosts = testinfra.utils.ansible_runner.AnsibleRunner(
|
|
||||||
os.environ['MOLECULE_INVENTORY_FILE']).get_hosts('all')
|
|
||||||
|
|
||||||
|
|
||||||
def test_for_logfile(host):
|
|
||||||
assert host.file("/tmp/json_error.log").exists
|
|
@ -1,15 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2019 Red Hat, Inc.
|
|
||||||
# All 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.
|
|
@ -1,22 +0,0 @@
|
|||||||
---
|
|
||||||
# Copyright 2019 Red Hat, Inc.
|
|
||||||
# All 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.
|
|
||||||
|
|
||||||
|
|
||||||
- name: Force error
|
|
||||||
package:
|
|
||||||
name: bison
|
|
||||||
state: notastate
|
|
||||||
ignore_errors: true
|
|
@ -22,14 +22,6 @@
|
|||||||
vars:
|
vars:
|
||||||
tox_envlist: mol-test_deps
|
tox_envlist: mol-test_deps
|
||||||
|
|
||||||
- job:
|
|
||||||
name: tripleo-ansible-centos-7-molecule-test_json_error_callback
|
|
||||||
parent: tripleo-ansible-centos
|
|
||||||
files:
|
|
||||||
- ^tripleo_ansible/roles/test_json_error_callback/.*
|
|
||||||
vars:
|
|
||||||
tox_envlist: mol-test_json_error_callback
|
|
||||||
|
|
||||||
- job:
|
- job:
|
||||||
name: tripleo-ansible-centos-7-molecule-test_package_action
|
name: tripleo-ansible-centos-7-molecule-test_package_action
|
||||||
parent: tripleo-ansible-centos
|
parent: tripleo-ansible-centos
|
||||||
@ -42,6 +34,9 @@
|
|||||||
- job:
|
- job:
|
||||||
name: tripleo-ansible-centos-7-molecule-tuned
|
name: tripleo-ansible-centos-7-molecule-tuned
|
||||||
parent: tripleo-ansible-centos
|
parent: tripleo-ansible-centos
|
||||||
|
description: |
|
||||||
|
Run molecule tests. Uses tox with the ``mol-tuned`` environment.
|
||||||
|
voting: true
|
||||||
files:
|
files:
|
||||||
- ^tripleo_ansible/roles/tuned/.*
|
- ^tripleo_ansible/roles/tuned/.*
|
||||||
vars:
|
vars:
|
||||||
|
@ -4,7 +4,6 @@
|
|||||||
jobs:
|
jobs:
|
||||||
- openstack-tox-linters
|
- openstack-tox-linters
|
||||||
- tripleo-ansible-centos-7-molecule-test_deps
|
- tripleo-ansible-centos-7-molecule-test_deps
|
||||||
- tripleo-ansible-centos-7-molecule-test_json_error_callback
|
|
||||||
- tripleo-ansible-centos-7-molecule-test_package_action
|
- tripleo-ansible-centos-7-molecule-test_package_action
|
||||||
- tripleo-ansible-centos-7-molecule-tuned
|
- tripleo-ansible-centos-7-molecule-tuned
|
||||||
- tripleo-ansible-docs
|
- tripleo-ansible-docs
|
||||||
|
Loading…
x
Reference in New Issue
Block a user