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
Matthew Jones
fa702a7a59 Remove registration of instance from develop makefile target... on new
installations the database isn't available at this point
2014-11-11 15:51:13 -05:00
Luke Sneeringer
1edd8f9c0a Updates to Makefile and CONTRIBUTING
...for the RabbitMQ to Redis changeout.
2014-11-11 14:18:39 -06:00
James Laska
1559ba50bb Be sure to minify before building RPMs
Also, break out individual clean targets that were helpful for testing
specific components.
2014-10-22 16:41:24 -04:00
Luke Sneeringer
ad97ebb09b Fix Makefile 2014-10-22 10:37:42 -05:00
James Laska
d7792413a0 Allow specifying RPM_DIST when running Makefile
Fixes an issue where the system running make isn't the desired %{dist}
target (e.g. building el7 packages on an el6 system).
2014-10-21 15:51:07 -04:00
James Laska
5905459fc6 Python source removal now happens during packaging
The dark arts previously used in the setup.py have now been pushed off
to debian/rules and ansible-tower.spec.
2014-10-20 16:16:57 -04:00
Luke Sneeringer
47cdb6fc57 register_instance in make develop 2014-10-20 14:46:47 -05:00
James Laska
5d4444235a Switch to dh-python2 and remove py files during packaging 2014-10-19 18:27:28 -04:00
James Laska
3512b93c17 Disable pre-byte-compiling .py files for debian builds
Also includes:
* Override pysupport build and install arguments
* Increase verbosity when logging install_lib changes
2014-10-18 14:40:43 -04:00
James Laska
c2c0dee090 Correct variable typo in Makefile 2014-10-18 13:06:15 -04:00
James Laska
8f46719ef3 Add missing mock-rpm prereq
Fixes an issue where rpm-build was not created prior to running
'mock-rpm'.
2014-10-17 15:47:04 -04:00
James Laska
bfce078ce4 Consolidate RPM and DEB build process
* Add reprepro target
* Use debuild for building deb packages
* Use the same setuptools target for RPM and DEB
* Update rpm and deb changelogs for existing releases
2014-10-17 14:54:23 -04:00
James Laska
d12dddebde Handle jenkins requirements properly 2014-10-02 16:16:27 -04:00
James Laska
f9c8e400b1 Update dev_local.txt with django-debug-toolbar-1.1
Correct jenkins requirements install order
2014-10-02 15:46:03 -04:00
James Laska
adda5b90bd More fiddling with jenkins requirements 2014-10-02 14:19:18 -04:00
James Laska
888352270b More updates to support latest django_jenkins 2014-10-02 13:26:32 -04:00
James Laska
2b1b83a8ee Yes, please download jenkins dependencies 2014-10-02 12:05:45 -04:00
James Laska
8a247ae2c4 Add requirements/jenkins.txt
Moves custom test requirements out of jenkins and into the repository.
2014-09-10 15:25:58 -04:00
Luke Sneeringer
59f3321b13 Updating Django to 1.6.7 in revision txts. 2014-09-10 13:36:03 -05:00
Luke Sneeringer
3267a988f8 Shift Django to 1.6.x (>= 1.6.7). 2014-09-10 12:17:35 -05:00
James Laska
41e2cf0a65 Prefix the release with '0.' for unofficial releases 2014-09-03 19:40:10 -04:00
James Laska
116e1db2a8 Remove ngdocs on 'make clean' 2014-08-28 12:12:04 -04:00
James Laska
5fe92d8013 Add ngdocs Makefile target
Also, update jshint target to match grunt command.
2014-08-28 12:01:35 -04:00
James Laska
0615bd5cb9 Correct make target name 2014-07-08 15:59:42 -04:00
James Laska
297f17d849 Adjust node_modules make dependencies 2014-07-08 15:57:21 -04:00
James Laska
1d7e5a646d Move grunt/js packaging files under packaging/grunt/ 2014-07-08 10:25:20 -04:00
James Laska
69165b762a Resolve npm repository warning 2014-07-08 10:25:20 -04:00
James Laska
e8dc57ff36 Move django_jenkins into development.py 2014-06-05 15:00:21 -04:00
James Laska
296917af54 Move test_jenkins configuration into awx/settings/jenkins.py 2014-06-05 14:06:20 -04:00
James Laska
22db69eb70 test_jenkins - minified files are already excluded 2014-06-05 12:24:50 -04:00
James Laska
f0fe6673f2 Add JENKINS_TASKS to django_jenkins
New tasks include run_pylint, run_pep8, run_pyflakes, run_jshint and
run_csslint.
2014-06-05 12:09:54 -04:00
James Laska
54713b1a2e Create aliases for generating RPM and DEB sdist
Adds the following aliases to assist with packaging-specific sdist.
 * dev_deb and release_deb - includes only .pyc files
 * dev_rpm and release_rpm - includes only .py files (later removed by
   install_lib)

The rpm sdist tarball is a traditional source distribution.  During the build
process, RPM will byte-compile and remove the .py source files.  The deb sdist
includes only byte-compiled awx python.
2014-05-22 11:40:47 -04:00
James Laska
f2c1893dac Update package build workflow
* Update RPM BuildRequires
* Modify 'sdist' setuptools cmdclass to include .py files
* Add 'install_lib' setuptools cmdclass to exclude .py files
2014-05-13 15:09:47 -04:00
James Laska
50d7d64d9a Update pep8 path exclusions 2014-05-13 08:53:39 -04:00
James Laska
5df185b7af Add mock makefile targets
Simplifing the RPM build process by moving the jenkins build workflow into the
Makefile.  This starts with mock.  Additional buildrequires changes likely to
follow.
2014-05-09 08:59:02 -04:00
Matthew Jones
21d0b6301e Update server makefile behavior with two mechanisms one of which will
start the development services in tmux but not attach to the session
2014-05-02 15:26:05 -04:00
James Laska
985d68a187 AMI packaging improvements
Several AMI packaging changes, including:

 * Set a default value for OFFICIAL=no
 * Include tower version in ami_description and tag:Name
 * Packer will tag the AMI to help with visually identifying AMIs (tags used
   include Name, aws_instance_count, product_name, product_version)
 * Removed license/* files.  The license instance count is supplied via an
   environment variable AWS_INSTANCE_COUNT
 * Update reset/install_aws.sh to require an instance count parameter (-c)
2014-04-29 11:19:14 -04:00
James Laska
557b92ef05 Don't forget to minify the js during sdist 2014-04-24 13:22:46 -04:00
James Laska
b4d06796a3 Add pep8 and pyflakes Makefile targets 2014-04-23 13:55:23 -04:00
James Laska
02c4a39865 Add SELinux module to allow socket.io
This also makes several smaller style/format changes to the .spec file.
2014-04-23 13:55:23 -04:00
Matthew Jones
7c43dced0f a bit better pane selection when splitting 2014-04-16 15:30:49 -04:00
Matthew Jones
69583a1b07 Import socketio service work and updates to documentation and setup procedures 2014-04-16 15:27:04 -04:00
Chris Church
8901cd31e7 Install setuptools/Django development packages separately before installing the others. 2014-03-31 14:08:14 -04:00
Matthew Jones
c9340cf5f1 Add a new mechanism for automagically creating a tmux session, splitting it into panes, and starting each Tower needed tower service... This is so you don't have to start each one manually 2014-03-19 13:51:55 -04:00
Matthew Jones
bf19b76d5a Merge remote-tracking branch 'origin/task-system-rework'
* origin/task-system-rework: (36 commits)
  Need to grab just the first item for the scm test project update
  Revert a project unit test
  Make sure we are calling signal_start in unit tests
  Make sure we are calling signal_start in unit tests
  Bypass task runner system in normal job start tests... we'll test it another way so assume we want to just start the job right away
  Fixing up unit tests
  Missing line-end comma
  Prevent deadlocks on unit tests in a very specific scenario
  Ignore checking celery task list during some unit tests, triggered by UNIT_TEST_IGNORE_TASK_WAIT
  Missing semicolon
  Remove update on launch, we'll test this another way
  Make sure we ignore the wait update for tasks under dependency situations in the unit tests
  Fix up run task manager script to handle signals, fix up task cancel job, add restart handler for ubuntu
  Fix some bugs found from unit tests
  More unit test rework
  Some job tests can't run in their current state
  Make sure we check arguments passed to signal start before allowing it to proceed.
  No need to replace original build_args
  Unit test updates for task system... remove old monkeypatch procedure for getting job args in favor of using the job info from the database. Can't do this anymore anyway since the job is running in another process
  Changes to tasks unit tests
  ...
2014-03-19 13:14:21 -04:00
James Laska
20aa89e33c Adjust interactive shell test
To improve grunt readability from test automation, disable colorized output
when running a non-interactive shell.
2014-03-19 11:29:02 -04:00
Matthew Jones
06cc5ffb4a Docs and setup details for the task manager 2014-03-12 14:09:00 -04:00
James Laska
414e43c469 Fix conditional for older bash 2014-03-06 15:01:33 -05:00
James Laska
02a4ff1c36 Disable grunt color output when called from a non-interactive shell
The grunt command is still configurable via the GRUNT environment variable.  By
default, we disable colored output when we detect the shell is non-interactive.
This improves reviewing output when run from automation.
2014-03-06 09:39:20 -05:00
James Laska
4dcc6938dd Allow customizing grunt cli options
Automation can now set GRUNT to provide a path to a specific grunt binary, or
to add grunt parameters.  For example, to disable color output during a Jenkins
build:

    GRUNT="grunt --no-color" make lintjs
2014-03-06 08:56:02 -05:00
James Laska
a4257e207c Create package.json during build target
Rather than hard-code the name and version in package.json, generate the file
during the build process.  The strings %NAME% and %VERSION% will be replaced
with appropriate values during a new build target 'package.json'.
2014-02-26 08:39:41 -05:00
Matthew Jones
2a65fbe77c Update contributing documentation and add receiver target to Makefile 2014-02-18 15:16:39 -05:00
James Laska
4df13d7e99 Add 'npm install' task to the make process
Also, clean up node_modules/ and other generated .js and .css files during
'make clean'.
2014-02-17 10:18:33 -05:00
Chris Houseknecht
2fcb5a1ae4 More updates to contributing doc. Added Grunt to Makefile. Use lintjs to inspect .js files for lint and errors. Use minjs to compile and compress the .js and .less files. 2014-02-12 22:19:30 +00:00
Chris Church
32364ad055 AC-990 Add new task for saving all job events from a queue, updated callback plugin to send to queue, work on optimizing SQL that runs when saving a job event. 2014-02-03 17:05:03 -05:00
James Laska
df9be04a20 Require LICENSE_TIER to specify the license filename
Previously, LICENSE_TIER was used to generate the license file by appending
'.json'.
2014-02-03 13:52:00 -05:00
James Laska
ab7c65df1d Add official ansible-tower-1.4.5 AMI license files
Update Makefile syntax to no longer generate the license as a build step.  In
addition, updated ansible-tower.json to provide a more descriptive ami_name and
ami_description.
2014-02-03 13:24:40 -05:00
Chris Church
9790715a25 Update make develop command, version check after package rename. 2014-01-29 13:49:33 -05:00
James Laska
97b776cf23 Fix ansible-tower deb build 2014-01-29 13:10:21 -05:00
Jenkins
9e119fc8a9 Rename package awx to ansible-tower 2014-01-29 12:57:22 -05:00
James Laska
ef52e92c86 Correct incorrect Makefile variable 2014-01-28 10:21:30 -05:00
James Laska
c78728fdf3 Allow customizing packer license tier 2014-01-28 09:59:08 -05:00
Matthew Jones
9bbeeb90a8 Fix AC-955, disable task prefetching by celery. 2014-01-22 16:05:26 -05:00
James Laska
9da579aa32 Add Makefile support for customizing packer command 2014-01-07 14:14:07 -05:00
James Laska
2f2724b866 Correct Makefile syntax for ami target 2014-01-07 12:45:54 -05:00
James Laska
1bae5b7dd5 Create 'ami' target that relies on OFFICIAL variable 2014-01-07 12:04:25 -05:00
Matthew Jones
2935824b7a Add ami packaging support and update Makefile 2014-01-07 11:53:30 -05:00
Chris Houseknecht
d02d2ebf15 Installed FontAwesome 4. Modified form and list generation to force icon selection through a single method so that icons, icon sizes and button colors are all consistent. Everything seems to be working now with the exception of the status bubbles on list pages. Will need to modify ansible-ui.less anc change the unicode strings to new FontAwesome values. 2013-12-20 23:17:02 +00:00
Chris Church
870c36f5bf Remove --autoreload option from celeryd target, doesn't seem to work anyways. 2013-11-20 22:23:47 -05:00
Chris Church
e0a94cbf32 AC-505 Add vendored copies of ec2 and rax inventory scripts from Ansible (for now). Add vendored versions of boto and pyrax and all their dependencies, updated all vendored packages to latest versions. 2013-09-29 20:36:46 -04:00
Chris Church
9fc46e6292 AC-474. Updates to contributing doc, along with related Makefile, testing and settings changes. 2013-09-24 21:41:00 -04:00
James Cammarata
f70dcf8dbb Adding minified js steps to packaging plus other minor fixes
* Added a new make tarket (minjs) to run the compile script
  and modified the sdist target to require it
* Minor fixes to packaging to chown/chmod the SECRET_KEY file
  to the proper user and permissions
2013-07-16 12:19:18 -05:00
James Cammarata
a6fe88cc3c Fixing Makefile for deb builds
* Minor issue due to fixing up the RELEASE variable related to
  the sdist tarball name the "make deb" command expected
2013-07-07 18:35:22 -04:00
James Cammarata
2cf269bd1e Forgot to fix one line in the Makefile for the VERSION|BUILD 2013-06-30 02:10:55 -04:00
Michael DeHaan
5ae1ccfa3b Added code to raise permission denied on exceeded server counts using licensing system.
Some very minor/misc cleanup and minor docs also included.
2013-06-29 14:52:38 -04:00
James Cammarata
c649aedc8b Minor change to fix an issue with official rpm builds 2013-06-26 08:10:17 -04:00
James Cammarata
1a3fbcd796 Change for RPM packaging to allow daily dev builds 2013-06-26 07:33:09 -04:00
Chris Church
bf5a1d1d67 Added modified sdist command to distribute certain files as pyc only. 2013-06-25 19:46:20 -04:00
James Cammarata
a86ebc9221 Fixing release_ball Makefile target 2013-06-25 19:42:41 -04:00
James Cammarata
946492b023 Changes to build process to remove .py files 2013-06-25 14:30:40 -04:00
James Cammarata
cbc9f18366 More debian packaging stuff
* Added ability to do official vs dev builds (need to add to the
  RPM builds now)
* Reverted changes to awx/wsgi.py after talking with Chris C.
  regarding the pathing issues and created config/wsgi.py instead
  that is installed to /var/lib/awx
* Cleaned up package scripts so there's less junk being written to
  the screen during the install/uninstall
2013-06-24 13:06:11 -04:00
James Cammarata
80afb2e08d More work on debian packaging 2013-06-24 01:16:00 -04:00
James Cammarata
c2a0004c6c Initial work for packaging .deb 2013-06-23 15:40:07 -04:00
Chris Church
07657926b9 Rename ansibleworks to awx. 2013-06-23 13:21:02 -04:00
Chris Church
f0a0a69ec7 Makefile updates, updated requirement packages, added requirements files for both local and PyPI installations. 2013-06-20 15:53:20 -04:00
James Cammarata
ca4050aee8 Adding ability to run "make rpm" 2013-06-15 22:02:30 -05:00
Michael DeHaan
6f43190b2b Fixup makefile 2013-06-12 16:13:34 -04:00
Chris Church
cba55a061a Numerous model-related updates and supporing changes, including:
- Add variables field on Host/Group models and remove separate VariableData model.
- Add data migrations for existing variable data.
- Update views, serializers and tests to keep roughly the same API interface for variable data.
- Add has_active_failures properties on Group/Host models to provide indication of last job status.
- Add job_tags field on JobTemplate/Job models to specify tags to ansible-playbook.
- Add host_config_key field to JobTemplate model for use by empheral hosts.
- Add job_args, job_cwd and job_env fields to Job model to capture more info from running the job.
- Add failed flag on JobHostSummary model.
- Add play/task fields on JobEvent model to capture new context variables from callback.
- Add parent field on JobEvent model to capture hierarchy of job events.
- Add hosts field on JobEvent model to capture all hosts associated with the event (especially useful for parent events in the hierarchy).
- Removed existing Tag model, replace with django-taggit instead.
- Removed existing AuditLog model, replacement TBD.
2013-06-10 17:34:37 -04:00
Michael DeHaan
95ce3cddf7 Rename directory structure in release package. 2013-05-26 11:01:00 -04:00
Michael DeHaan
13ccb6fbdf Add makefile target to build release package, assumes ansible-doc checked out at same level. 2013-05-24 19:22:12 -04:00
Chris Church
c71a04dfb0 Minor fix to migration cleanup target. 2013-05-24 18:12:20 -04:00
Chris Church
c0aaff7850 Cleaned up migrations, updated Makefile migrate target to handle this change. 2013-05-24 17:55:03 -04:00
Chris Church
1ef11155da Added new set of playbooks for deploying to a single-server configuration, including Vagrant configuration for testing. 2013-05-23 03:22:26 -04:00
Chris Church
9478d8d532 Updates to setup/requirements, add Makefile target for running tests with coverage. 2013-05-21 19:08:46 -04:00
Chris Church
aeac739735 Major rename of package from lib to ansibleworks. 2013-05-21 18:20:26 -04:00
Chris Church
5133b9a30e Update to production settings to fail if no config found, updates to build script, added Makefile targets for build. 2013-05-21 17:39:40 -04:00
Chris Church
cc25d55121 Work in progress on credential/job updates. 2013-04-24 00:43:36 -04:00
Chris Church
a1fb81c4f4 Added basic celery support and configuration. 2013-03-14 16:11:14 -04:00
Michael DeHaan
273b447250 Change the way we sync, add notes about superuser setup. 2013-03-13 17:20:50 -04:00
Michael DeHaan
9491453887 Working on migrations 2013-03-13 16:29:51 -04:00
Michael DeHaan
b97193e6a0 Pull requirements from pip so we get later things on CentOS 6, etc 2013-03-13 16:06:45 -04:00
Michael DeHaan
2ce1af0325 Reference apps as acom.main 2013-03-13 15:28:30 -04:00
Michael DeHaan
b5a1b2d423 move manage.py up one level 2013-03-13 15:21:06 -04:00
Michael DeHaan
495639611e Flesh out database model. 2013-03-13 15:15:35 -04:00
Michael DeHaan
5f0692e6d0 Init repo 2013-03-13 13:09:36 -04:00
Michael DeHaan
1853d32020 Various Django cleanup 2013-02-28 19:52:14 -05:00