Skip to content

Commit

Permalink
Release 0.1.0
Browse files Browse the repository at this point in the history
Changelog:
* use inventory file from project
* add sorting in ansible param drop-down box
* show username in history initiator field
* show periodic task name in history initiator field
* update git libs
* disallow to set templates without project and inventory
* rewrite auth_permissions in API
* add http- and script-hooks api
* add comlex stats for user
* fast-write vars in inventory (from text)
* fixed bug with quotes in vars
* fix other GUI bugs

See merge request cloud/polemarch!41
  • Loading branch information
onegreyonewhite committed Dec 1, 2017
2 parents 26d844a + b1fffc3 commit c9cf7f4
Show file tree
Hide file tree
Showing 103 changed files with 7,687 additions and 6,248 deletions.
1 change: 1 addition & 0 deletions .coveragerc
Original file line number Diff line number Diff line change
Expand Up @@ -20,3 +20,4 @@ omit =
exclude_lines =
pragma: no cover
nocv
noce
50 changes: 34 additions & 16 deletions .gitlab-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,23 @@ stages:

.pack_tamplate: &packing-test
stage: packaging-test
variables:
MYSQL_ROOT_PASSWORD: 'polemarch'
MYSQL_DATABASE: 'polemarch'
MYSQL_USER: 'polemarch'
MYSQL_PASSWORD: 'polemarch'
RABBITMQ_DEFAULT_USER: 'polemarch'
RABBITMQ_DEFAULT_PASS: 'polemarch'
RABBITMQ_DEFAULT_VHOST: 'polemarch'
services:
- name: 'mysql:latest'
alias: 'db-server'
- name: 'memcached'
alias: 'cache-server'
- name: 'memcached'
alias: 'locks-server'
- name: 'rabbitmq:latest'
alias: 'rabbitmq-server'
artifacts:
name: "package($CI_BUILD_NAME)"
expire_in: 1 hour
Expand Down Expand Up @@ -67,12 +84,16 @@ stages:
code_style:
stage: code_standarts
script:
- make test ENVS=pep,flake,pylint
- make test ENVS=flake,pylint
cache:
paths:
- .tox/pylint
- .tox/flake
only:
- /^issue_.*$/
- /^.{0,}issue_.*$/
retry: 2

py27-django18-coverage:
py27-django111-coverage:
<<: *branch_tests
variables:
TOX_ENVS: "$CI_BUILD_NAME"
Expand All @@ -85,27 +106,36 @@ py34-django111-coverage:
default_rpm_tests:
<<: *packing-test
script:
- cat /etc/hosts
- make rpm RELEASE=${CI_BUILD_ID}
- sudo yum install dist/*.rpm -y -q
- sudo cat test_settings.ini > /etc/polemarch/settings.ini
- sudo chown polemarch:polemarch /etc/polemarch/settings.ini
- sudo -H -u polemarch /opt/polemarch/bin/pip install -r requirements-test.txt
- sudo -H -u polemarch /opt/polemarch/bin/polemarchctl test -v2 polemarch.main.tests

default_oracle_tests:
<<: *packing-test
image: onegreyonewhite/tox:oracle
script:
- cat /etc/hosts
- make rpm RELEASE=${CI_BUILD_ID}
- sudo yum install dist/*.rpm -y -q
- sudo cat test_settings.ini > /etc/polemarch/settings.ini
- sudo chown polemarch:polemarch /etc/polemarch/settings.ini
- sudo -H -u polemarch /opt/polemarch/bin/pip install -r requirements-test.txt
- sudo -H -u polemarch /opt/polemarch/bin/polemarchctl test -v2 polemarch.main.tests

default_deb_tests:
<<: *packing-test
image: onegreyonewhite/tox:ubuntu
script:
- cat /etc/hosts
- make deb RELEASE=${CI_BUILD_ID}
- echo "echo 'hello'" > /bin/systemctl
- sudo apt install ./dist/*.deb -y -q
- sudo cat test_settings.ini > /etc/polemarch/settings.ini
- sudo chown polemarch:polemarch /etc/polemarch/settings.ini
- sudo -H -u polemarch /opt/polemarch/bin/pip install -r requirements-test.txt
- sudo -H -u polemarch /opt/polemarch/bin/polemarchctl test -v2 polemarch.main.tests

Expand All @@ -124,20 +154,8 @@ build_zip:
- dist/
retry: 2

py27-django18:
<<: *tests_template
py27-django19:
<<: *tests_template
py27-django110:
<<: *tests_template
py27-django111:
<<: *tests_template
py34-django18:
<<: *tests_template
py34-django19:
<<: *tests_template
py34-django110:
<<: *tests_template
py34-django111:
<<: *tests_template
py35-django111:
Expand All @@ -151,7 +169,7 @@ pep8_checks:
- master
- developer
script:
- make test ENVS=pep,flake
- make test ENVS=flake
allow_failure: false
retry: 2

Expand Down
4 changes: 2 additions & 2 deletions .pep8
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[pep8]
ignore = E221,E222,E121,E123,E126,E226,E24,E704,E116,E731
ignore = E221,E222,E121,E123,E126,E226,E24,E704,E116,E731,E722,E741
exclude = ./polemarch/*/migrations/*,./polemarch/main/settings*.py,.tox/*,./etc/*,./*/__init__.py,./t_openstack.py

[flake8]
ignore = E221,E222,E121,E123,E126,E226,E24,E704,E116,E731
ignore = E221,E222,E121,E123,E126,E226,E24,E704,E116,E731,E722,E741
exclude = ./polemarch/*/migrations/*,./polemarch/main/settings*.py,.tox/*,./etc/*,./*/__init__.py,./t_openstack.py
4 changes: 2 additions & 2 deletions .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

# Add files or directories to the blacklist. They should be base names, not
# paths.
ignore=CVS,migrations,tests,settings.py,settings_production.py
ignore=CVS,migrations,unittests,tests,settings.py,settings_production.py

# Add files or directories matching the regex patterns to the blacklist. The
# regex matches against base names, not paths.
Expand Down Expand Up @@ -65,7 +65,7 @@ confidence=
# --enable=similarities". If you want to run only the classes checker, but have
# no Warning level messages displayed, use"--disable=all --enable=classes
# --disable=W"
disable=expression-not-assigned,broad-except,logging-format-interpolation,model-no-explicit-unicode,too-many-ancestors,bad-continuation,bad-whitespace,redefined-builtin,missing-docstring,redefined-variable-type,no-self-use,line-too-long,suppressed-message,cmp-method,no-absolute-import,xrange-builtin,using-cmp-argument,basestring-builtin,backtick,unpacking-in-except,old-raise-syntax,getslice-method,long-builtin,print-statement,reduce-builtin,filter-builtin-not-iterating,import-star-module-level,unichr-builtin,dict-iter-method,range-builtin-not-iterating,file-builtin,old-division,standarderror-builtin,coerce-builtin,setslice-method,old-ne-operator,long-suffix,execfile-builtin,oct-method,metaclass-assignment,intern-builtin,apply-builtin,dict-view-method,raw_input-builtin,raising-string,coerce-method,unicode-builtin,next-method-called,hex-method,nonzero-method,round-builtin,cmp-builtin,reload-builtin,buffer-builtin,useless-suppression,zip-builtin-not-iterating,indexing-exception,map-builtin-not-iterating,delslice-method,old-octal-literal,input-builtin,parameter-unpacking,model-has-unicode,bare-except,too-few-public-methods,fixme,dangerous-default-value,attribute-defined-outside-init,pointless-string-statement,too-many-instance-attributes,arguments-differ,binary-op-exception,bad-classmethod-argument,locally-disabled,file-ignored,multiple-statements,superfluous-parens
disable=old-style-class,no-init,expression-not-assigned,broad-except,logging-format-interpolation,model-no-explicit-unicode,too-many-ancestors,bad-continuation,bad-whitespace,redefined-builtin,missing-docstring,redefined-variable-type,no-self-use,line-too-long,suppressed-message,cmp-method,no-absolute-import,xrange-builtin,using-cmp-argument,basestring-builtin,backtick,unpacking-in-except,old-raise-syntax,getslice-method,long-builtin,print-statement,reduce-builtin,filter-builtin-not-iterating,import-star-module-level,unichr-builtin,dict-iter-method,range-builtin-not-iterating,file-builtin,old-division,standarderror-builtin,coerce-builtin,setslice-method,old-ne-operator,long-suffix,execfile-builtin,oct-method,metaclass-assignment,intern-builtin,apply-builtin,dict-view-method,raw_input-builtin,raising-string,coerce-method,unicode-builtin,next-method-called,hex-method,nonzero-method,round-builtin,cmp-builtin,reload-builtin,buffer-builtin,useless-suppression,zip-builtin-not-iterating,indexing-exception,map-builtin-not-iterating,delslice-method,old-octal-literal,input-builtin,parameter-unpacking,model-has-unicode,bare-except,too-few-public-methods,fixme,dangerous-default-value,attribute-defined-outside-init,pointless-string-statement,too-many-instance-attributes,arguments-differ,binary-op-exception,bad-classmethod-argument,locally-disabled,file-ignored,multiple-statements,superfluous-parens


[REPORTS]
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
PIP=pip2
PY=python2
LOC_TEST_ENVS = build,py27-django18-coverage,py34-django111-coverage,pep,flake,pylint
LOC_TEST_ENVS = build,py27-django111-coverage,py34-django111-coverage,flake,pylint
ENVS = $(LOC_TEST_ENVS)
TESTS =
NAME = polemarch
Expand Down
Loading

0 comments on commit c9cf7f4

Please sign in to comment.