Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: testing molecule PRs #8

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions .zuul.yaml
Expand Up @@ -5,6 +5,7 @@
- ansible-tox-linters
- ansible-tox-molecule:
required-projects:
- ansible/molecule
- ansible-security/ids_install
gate:
jobs:
Expand Down
2 changes: 2 additions & 0 deletions molecule/default/molecule.yml
Expand Up @@ -18,6 +18,8 @@ platforms:
container: docker
provisioner:
name: ansible
env:
ANSIBLE_ROLES_PATH: ~/.ansible/roles
lint:
name: ansible-lint
scenario:
Expand Down
9 changes: 9 additions & 0 deletions setup.cfg
@@ -0,0 +1,9 @@
[metadata]
name = ids_config
classifier =
Intended Audience :: Information Technology
Intended Audience :: System Administrators
License :: OSI Approved :: Apache Software License
Operating System :: POSIX :: Linux
Programming Language :: Python
Programming Language :: Python :: 3
21 changes: 21 additions & 0 deletions setup.py
@@ -0,0 +1,21 @@
#!/usr/bin/env python
# Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
#
# 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 setuptools

setuptools.setup(
setup_requires=['pbr>=1.3'],
pbr=True)
4 changes: 1 addition & 3 deletions tools/install_roles.sh
Expand Up @@ -23,6 +23,4 @@ if [ -d /etc/dib-manifests/ ]; then
sed -e "s|https://|file://${HOME}/src/|g" -i $TOOLSDIR/../requirements.yml
fi

# NOTE(pabelanger): We should make this role path less hardcoded, however we
# first need to patch molecule.
ansible-galaxy install -v -r $TOOLSDIR/../requirements.yml -p ~/.cache/molecule/ids_config/default/roles $@
ansible-galaxy install -v -r $TOOLSDIR/../requirements.yml -p ~/.ansible/roles $@
3 changes: 3 additions & 0 deletions tox.ini
Expand Up @@ -6,11 +6,14 @@ skipsdist = True
[testenv]
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
install_command = pip install {opts} {packages}

[testenv:linters]
commands =
molecule lint

[testenv:molecule]
setenv =
MOLECULE_NO_LOG=false
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is no longer needed because of this PR: #10

commands =
molecule test