1
0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 16:51:11 +03:00
Commit Graph

256 Commits

Author SHA1 Message Date
Akita Noek
e9c3d98a44 Merge branch 'devel' of github.com:ansible/ansible-tower into rbac 2016-03-04 14:02:01 -05:00
Matthew Jones
714d13eefd Update docker development workflow to not require make develop 2016-03-02 12:09:42 -05:00
Akita Noek
444aed1ab2 Switch make init to use manage.py directly instead of awx-manage, saves from having to install in order to do an init 2016-03-01 15:37:00 -05:00
Akita Noek
ea2cabe4d4 Merge branch 'devel' of github.com:ansible/ansible-tower into merge-devel 2016-03-01 15:09:58 -05:00
Matthew Jones
99ec07b8a5 Merge branch 'notifications_work' into devel
* notifications_work: (23 commits)
  Updates to notification unit tests after @wwitzel3's feedback
  Fix some notifications issues and write some tests
  Add notification system documentation
  Clean up flake8 related issues
  Fixing up some unicode issues
  Implement tower ui view url on models
  Sanity check and force proper types in admin check
  Proper type for in check
  Adding migration and base notification type
  Add a periodic administrative notification
  Refactor message generator
  Support notification password field encryption
  Notification configuration type checking
  Refactor NotificationTemplate to Notifier
  Implement irc notification backend
  Add webhook notification backend
  Pagerduty and Hipchat backends plus some cleanup
  Notification serializers, views, and tasks
  Implement notification serializer and validations
  Notification endpoints and url expositions
  ...
2016-02-29 16:50:33 -05:00
Akita Noek
e18592fa87 Merge branch 'devel' into rbac 2016-02-24 16:14:32 -05:00
Matthew Jones
c3121211c3 Merge branch 'release_2.4.4' into devel
* release_2.4.4: (35 commits)
  Update changelog for 2.4.4 release
  Make pycompile non-fatal during deb build
  Revert "Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools"
  Roll back mock version due to packaging issues
  Add virtualenv site-pagkages to Python path before system dist-packages, to get new setuptools
  change to warning behavior
  Resolve bug when building with /bin/sh on Ubuntu
  Attempt to workaround pip install issue
  point at packages with source on pypi
  Mock requires a newer setuptools when building requirements
  requests needs openssl
  Properly set the shell during directory migration
  pyrax bumpb new python license
  Typo's are bad and should be vanquished
  Conditionally install 2.6 python requirements
  separate pip requirements file for python2.6
  Added missing 'skipped' field for no_log
  Obey no_log even more when using ansible 2.0
  bump shade from 0.5.0 to 1.4
  RHEL5 compatibility and handling of error scenarios
  ...
2016-02-22 10:09:47 -05:00
Wayne Witzel III
5306eaa98c more access tests and a Makefile driveby 2016-02-16 21:04:33 -05:00
Wayne Witzel III
18ea2e0201 default to reuse-db for testing 2016-02-05 21:40:01 -05:00
Matthew Jones
96b0fb168f Updating makefile migration generator 2016-02-04 15:52:23 -05:00
Wayne Witzel III
896ecab031 Added rbac tests and migrations for Organization 2016-02-04 15:12:25 -05:00
Chris Church
60224cdbe4 Update Django to 1.8 and DRF to 3.3, add new Django migrations, update serializers/pagination/metadata, update browsable API styling. 2016-02-02 17:48:04 -05:00
James Laska
cced99f75d Resolve bug when building with /bin/sh on Ubuntu
Ubuntu uses /bin/sh by default.  This change properly compares strings in a
POSIX compliant manner.
2016-02-02 12:45:08 -05:00
Wayne Witzel III
3982f34392 Merge pull request #764 from wwitzel3/docker-refresh
add a docker-refresh make target
2016-02-02 09:39:56 -05:00
Wayne Witzel III
71a1547c3a fixing ad_hoc imports
flake8 fixes

Fix and add awx/api/tests

added fact tests

added proper xml reports for jenkins

added jenkins requirements and adjusted Makefile target
2016-02-01 18:37:56 -05:00
Wayne Witzel III
3d4580611e added pytest to requirements_dev
reworking test strucutre

reworked pytest.ini, removed functional imports, updated req_dev

remove unneeded __init__ files

add testing checker to local_settings examples

adding testing packages to system Python for docker
2016-02-01 18:37:56 -05:00
Wayne Witzel III
5d6ea242c0 reorganzing tests folder
make tests a module

refacotring to local imports for tests

fixing test import of tasks

fixing test import of tasks

more testing fixups
2016-02-01 18:37:56 -05:00
Wayne Witzel III
a4aadc0b86 add a docker-refresh make target 2016-02-01 13:13:03 -05:00
James Laska
305b4fdead Typo's are bad and should be vanquished 2016-01-29 09:54:48 -05:00
James Laska
6b20539e38 Conditionally install 2.6 python requirements 2016-01-29 09:03:03 -05:00
Matthew Jones
87e50734a6 Merge branch 'release_2.4.2' into devel
* release_2.4.2: (23 commits)
  Updating 2.4.2 changelogs
  fix the connection check fix
  more robust check added to mongo db connection
  Adding a body to our OPTIONS requests fixes 415 error responses in IE11 and Edge.
  Don't hard-fail if default isn't defined on survey
  fixed custom login info bug
  Allow an org admin to delete project updates
  Disable elasticache instance gathering for aws
  Fix DEB builds by adding 2.4.2 to reprepro conf
  When the panel lists were consolidated down the list name was changed to 'all_jobs.'  When a job is clicked from the activity stream it should show the job list filtered down by ID.
  Rolled back job url change
  track modules on system tracking page by index
  correct spelling of consisting in help text
  Fixing up flake8
  The "job" href links in the activity stream don't point to the job details page.  This is an update to the jobs href to point to /#/jobs/(job.id).
  Wrapped the SourceChange call in a function so that it can be called without clearing the credential.  This fixes a bug where the credential was not showing up in the initial edit dialog even though the data was sent properly via the API.
  Revert change to Makefile, which was causing old .deb versions to be dropped from the repo
  Refactor scan_packages for os detection
  Remove stray debugging lines
  Add SUSE, OpenSuse and Debian to scan_packages
  ...
2015-12-09 13:06:47 -05:00
John Mitchell
364872a678 fixed typo of cp command 2015-12-09 10:19:34 -05:00
John Mitchell
c9d501c562 updated test-ui make target to be able to only run a single test file 2015-12-08 18:35:00 -05:00
John Mitchell
856e6c5c59 fixed test-ui debug mode not showing source files and phony tasks comment 2015-12-08 16:55:43 -05:00
John Mitchell
0b43398ef6 Rehaul of ui build process
Updated make tasks
Added coverage reports for ui
Added browser-sync support
Updated contribution doc
Updated npm dependencies (Jenkins and dev environment can both use Node 4.2.1)
2015-12-06 16:41:48 -05:00
Graham Mainwaring
54be15a694 Revert change to Makefile, which was causing old .deb versions to be dropped from the repo 2015-11-25 09:47:29 -05:00
James Laska
60a2787468 Use correct aw_repo_url when building packer 2015-11-06 15:19:35 -05:00
James Laska
fc8f8811af Resolve issue on precise keeping old debs around
Upgrades on precise kept installing the oldest 2.4.0 package in the pool.  The
following fix appears to correct that problem.
2015-11-05 12:53:15 -05:00
James Laska
71e9ce61e4 Revert "Add CFLAGS when building rhel6 site-packages"
To make this work, we'll also need:

    CFLAGS=-Qunused-arguments

For now, we'll explore forking dm.xmlsec.bindings.

This reverts commit be83561bfe996d5e5b2e291787f2e863fa5b9203.
2015-11-04 16:13:34 -05:00
James Laska
8a97a26aba Add CFLAGS when building rhel6 site-packages
Attempts to resolves https://trello.com/c/DL7MgYyO
2015-11-04 15:58:10 -05:00
James Laska
3ae78ca6e8 Fix typo in clean target 2015-10-15 20:30:36 -04:00
Matthew Jones
523a96ebce Add mongo shell container entrypoint also 2015-10-09 12:16:49 -04:00
Matthew Jones
531f00b1ac rm the old docker run container after stopping 2015-10-09 12:04:34 -04:00
Matthew Jones
bfc9512dc7 Also remove .deps_built with make clean 2015-10-09 11:58:48 -04:00
jlmitch5
6883d70805 fixed tmp dir deletion in make clean 2015-10-08 10:58:30 -04:00
Matthew Jones
dbd0a01410 Merge branch 'release_2.3.1' into devel
* release_2.3.1:
  Add 2.3.1 to the reprepro distribution manifest
  Update version to 2.3.1 and update changelog
  Remove unused time import
  Fix proot controlpersist cleanup issue
  Propagate necessary build changes from devel
  Update reprepro components
  Reenable the reprepro i386 repository
  Fix supervisor migration
  Fix reprepro/conf path in Makefile
  prefer the first version when packages are ambiguous
  Correct error message
  Fix omission
  Correct conditional stmt
  Improve logging when sourcerpm fails
  Fix typo
  Fix OFFICIAL deb Makefile
2015-10-02 16:37:45 -04:00
James Laska
949f4cb15d Propagate necessary build changes from devel 2015-10-01 12:06:01 -04:00
James Laska
8c5f7cf9b9 Add vmware-iso build target 2015-09-30 12:56:29 -04:00
James Laska
90c3ccfc8c Merge pull request #444 from jlaska/versioned_reprepro
Add support for versioning the reprepro
2015-09-29 13:56:50 -04:00
Chris Meyers
4111056b81 add docker-compose-test directive to Makefile 2015-09-29 10:45:25 -04:00
James Laska
f62814cc90 Add support for versioning the reprepro
This allows customers to install old versions of tower using older setup
tarballs.
2015-09-29 09:12:14 -04:00
James Laska
531fc4d8ed Correct reprepro/conf path in Makefile 2015-09-23 20:33:40 -04:00
James Laska
d7fb9b19b1 Fix reprepro/conf path in Makefile 2015-09-23 20:32:34 -04:00
James Laska
7582458a0a Cleanup merge fallout from release_2.3 2015-09-23 16:10:40 -04:00
James Laska
8358722c10 Fix OFFICIAL deb Makefile 2015-09-22 16:36:45 -04:00
Matthew Jones
256af567de Merge branch 'release_2.3' into devel
* release_2.3: (24 commits)
  Updated package changelogs
  Rephrase task name
  Make purge supervisor.conf conditional on 2.2 el6
  Fix another name typo.
  Update python-ldap license text.
  Add LGPL source directly so it gets shipped.
  Update font-awesome licenses per legal feedback
  Remove bundled_licenses - we are shipping the source for bundled items, and therefore do not need to provide this separately.
  Add more license texts.
  Add full Apache licenses to files, per Pam.
  Attempt to harden mongodb tgz download
  Correct DJRF/DJRF-mongoengine licenses, rename qsstats license to match pkg name.
  Fix some typos in file names, and add licenses for some things we have modified in our own repos.
  Update Ubuntu depends and ppa's
  Include source for bundled packages in bundle.
  Include license information in packaging
  Add READMEs for the license directories.
  vendored python licenses
  Add bundled licenses documentation
  Revert to stock libzmq3 for deb depends
  ...
2015-09-22 15:57:32 -04:00
Matthew Jones
4cf2f32451 Remove the contents of tmp/ on clean 2015-09-22 11:04:40 -04:00
Bill Nottingham
e4795111ef Remove bundled_licenses - we are shipping the source for bundled items, and therefore do not need to provide this separately. 2015-09-21 13:53:49 -04:00
James Laska
e1b6588602 Include license information in packaging 2015-09-18 16:42:03 -04:00
James Laska
07574c9b64 Add bundled licenses documentation
Also includes in the bundled tarball artifact.
2015-09-18 10:04:49 -04:00