From 126d74a910dc3d168e99fc64e81667c574bb6d85 Mon Sep 17 00:00:00 2001 From: Kevin Carter Date: Wed, 27 Jan 2016 09:59:22 -0600 Subject: [PATCH] Updated repo for new org Change-Id: Ic4465e617559fa3f3ba4b98d8ff5aa2d47d9d0e4 Signed-off-by: Kevin Carter --- .gitignore | 63 +++++++++++++++++++++++++++++++++++++++++++ .gitreview | 5 ++++ test-requirements.txt | 6 +++++ tox.ini | 40 +++++---------------------- 4 files changed, 81 insertions(+), 33 deletions(-) create mode 100644 .gitignore create mode 100644 .gitreview create mode 100644 test-requirements.txt diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..eca0492f --- /dev/null +++ b/.gitignore @@ -0,0 +1,63 @@ +# Override Files # +rpc_deployment/playbooks/lab_plays +rpc_deployment/vars/overrides/*.yml + +# Compiled source # +################### +*.com +*.class +*.dll +*.exe +*.o +*.so +*.pyc +build/ +dist/ +doc/build/ + +# Packages # +############ +# it's better to unpack these files and commit the raw source +# git has its own built in compression methods +*.7z +*.dmg +*.gz +*.iso +*.jar +*.rar +*.tar +*.zip + +# Logs and databases # +###################### +*.log +*.sql +*.sqlite + +# OS generated files # +###################### +.DS_Store +.DS_Store? +._* +.Spotlight-V100 +.Trashes +.idea +.tox +*.sublime* +*.egg-info +Icon? +ehthumbs.db +Thumbs.db +.eggs + +# User driven backup files # +############################ +*.bak + +# Generated by pbr while building docs +###################################### +AUTHORS +ChangeLog + +# Files created by releasenotes build +releasenotes/build diff --git a/.gitreview b/.gitreview new file mode 100644 index 00000000..073a401b --- /dev/null +++ b/.gitreview @@ -0,0 +1,5 @@ +[gerrit] +host=review.openstack.org +port=29418 +project=openstack/openstack-ansible-plugins.git + diff --git a/test-requirements.txt b/test-requirements.txt new file mode 100644 index 00000000..f9f762ea --- /dev/null +++ b/test-requirements.txt @@ -0,0 +1,6 @@ +ansible-lint +ansible>=1.9.1,<2.0.0 + +# this is required for the docs build jobs +sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2 +oslosphinx>=2.5.0 # Apache-2.0 diff --git a/tox.ini b/tox.ini index 7ac979d9..7c13be1c 100644 --- a/tox.ini +++ b/tox.ini @@ -1,26 +1,21 @@ [tox] minversion = 1.6 skipsdist = True -envlist = docs,pep8,bashate,ansible-syntax,ansible-lint +envlist = docs,pep8,bashate [testenv] usedevelop = True install_command = pip install -U {opts} {packages} setenv = VIRTUAL_ENV={envdir} -deps = -r{toxinidir}/dev-requirements.txt -commands = - /usr/bin/find . -type f -name "*.pyc" -delete - ansible-galaxy install \ - --role-file=ansible-role-requirements.yml \ - --ignore-errors \ - --force +deps = -r{toxinidir}/test-requirements.txt [testenv:docs] -commands = python setup.py build_sphinx +commands= + python setup.py build_sphinx # environment used by the -infra templated docs job [testenv:venv] -deps = -r{toxinidir}/dev-requirements.txt +deps = -r{toxinidir}/test-requirements.txt commands = {posargs} # Run hacking/flake8 check for all python files @@ -36,10 +31,12 @@ commands = --exclude-dir 'doc' \ --exclude-dir '*.egg' \ --exclude-dir '*.egg-info' \ + --exclude-dir '*templates' \ --exclude 'tox.ini' \ --exclude '*.sh' \ {toxinidir} | xargs flake8 --verbose" + [flake8] # Ignores the following rules due to how ansible modules work in general # F403 'from ansible.module_utils.basic import *' used; unable to detect undefined names @@ -62,26 +59,3 @@ commands = --exclude-dir '*.egg-info' \ --exclude 'tox.ini' \ {toxinidir} | xargs bashate --verbose --ignore=E003" - -[testenv:ansible-syntax] -changedir = tests -commands = - ansible-galaxy install \ - --role-file=ansible-role-requirements.yml \ - --ignore-errors \ - --force - ansible-playbook -i inventory \ - --syntax-check \ - --list-tasks \ - -e "rolename={toxinidir}" \ - test.yml - -[testenv:ansible-lint] -changedir = tests -commands = - ansible-galaxy install \ - --role-file=ansible-role-requirements.yml \ - --ignore-errors \ - --force - ansible-lint test.yml -