1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-30 13:55:31 +03:00
Commit Graph

326 Commits

Author SHA1 Message Date
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
James Laska
b57144046b Add support for pbuilder chroot builds
Additional fixes include:
 * Clean and pyc files in debian/rules
 * Reprepro changes
 * Update debian standards version
 * Update OS distro detection
2015-09-16 16:28:05 -04:00
Matthew Jones
519b0e8eef Merge branch 'release_2.3' into devel
* release_2.3: (54 commits)
  Upgrade changelog for 2.3
  Purge superlance
  Purge an old supervisor config
  Require chris-lea libzmq3
  Use the htpasswd command, not the module
  Fix a playbook syntax error for postgres
  Ensure postgres is started earlier in setup role
  Allow customizing npm path
  Include RPM-GPG-KEY-ansible-release for all releases
  Simplify GPG keys
  Correct broken RPM-GPG-KEY
  Use gpg --passphrase for signing CHECKSUM
  Handle rpm --addsign pasphrase prompts
  Adding docker-compose development workflow
  Fix license in spec file.
  Updates to selinux policy for some munin plugins
  ansible 1.8.4 requires sudo:true when using sudo_user
  Fix expect script timeout
  Disable timeout and correct sign.exp error
  Fix expect script hang
  ...
2015-09-11 16:03:52 -04:00
James Laska
32cf468059 Allow customizing npm path
So jenkins can use `npm --no-color`
2015-09-10 19:03:41 -04:00
James Laska
3f9dd3ab22 Simplify GPG keys 2015-09-10 16:26:59 -04:00
James Laska
19c847ae10 Use gpg --passphrase for signing CHECKSUM 2015-09-10 13:40:24 -04:00
jlmitch5
552e12a8eb Merge pull request #392 from jlmitch5/adhoc_2.4
Adhoc 2.4 - Tests and refactor
2015-09-10 10:34:11 -04:00
Matthew Jones
940910b9a3 Adding docker-compose development workflow 2015-09-09 17:17:48 -04:00
Matthew Jones
7263367c6d Adding docker-compose development workflow 2015-09-09 17:16:35 -04:00
John Mitchell
edd7a5bab2 create make target that will run js tests in chrome 2015-09-09 13:08:50 -04:00
James Laska
99444f2737 Fix Makefile tabs/spaces 2015-09-09 10:57:55 -04:00
James Laska
77f4a280e3 Correct bash conditional 2015-09-08 23:14:31 -04:00
James Laska
6fa26bd026 Properly sign DEBs using reprepro 2015-09-08 22:44:29 -04:00
James Laska
d183075519 Revert "Disable gpg tty requirement"
This reverts commit 205210045749de215988a08ebdc57503e6698b04.
2015-09-08 20:05:24 -04:00
James Laska
8abc7b7ae1 Disable gpg tty requirement 2015-09-08 19:57:16 -04:00
James Laska
a38e8ca889 Specify a gpg key for TAR artifacts 2015-09-08 19:51:35 -04:00
James Laska
aa6470b730 Re-enable package signing 2015-09-08 13:35:30 -04:00
James Laska
92d737e721 Fix path bug when creating CHECKSUM file 2015-09-05 08:39:32 -04:00
James Laska
b7a67ca176 Don't include the build path in CHECKSUM 2015-09-04 21:14:01 -04:00
James Laska
4aa6f74437 Only sign the CHECKSUM for OFFICIAL builds 2015-09-04 21:08:49 -04:00
James Laska
8383838296 Fix path in build target 2015-09-04 21:05:59 -04:00
James Laska
cb1d60939b Renamed packaging/offline -> packaging/bundle
Also replaced all instances off `offline` with `bundle`.  Also includes minor
trailing whitespace cleanup.
2015-09-04 14:10:50 -04:00
James Laska
b456f2955e Create CHECKSUM files for tarball targets
* Renames the setup_offline_tarball -> setup_bundle_tarball
* Uses sha256sum and gpg to create a --clearsign CHECKSUM file
2015-09-04 13:53:03 -04:00
James Laska
5e46262546 Remove DIST_FULL from offline-tar-build path
Also provide suitable defaults for RPM_DIST and RPM_ARCH when being run on a
platform that doesn't have the `rpm` command.
2015-09-03 20:42:43 -04:00
Matthew Jones
5727d722b6 Merge remote-tracking branch 'upstream/release_2.3' into devel
* upstream/release_2.3: (91 commits)
  Include python-{paramiko,ecdsa} dependencies
  Remove extra epel testing stanzas
  Unit test for ec2 credentialless inventory
  Fix issue with ec2 iam sync with no credential.
  Use the htpasswd command instead the ansible module
  Pip is no longer needed
  check local user root or not in ./configure
  Remove unneeded when check for super user addition
  Improve distro detection in setup.sh
  Fix superuser check on upgrade
  Minor improvements to setup.sh
  Remove ansible prerequisite check from configure
  Attempt to install ansible within setup.sh
  Allow munin processes to access postgres
  Move up base package dependency install
  fixes jenkins failures
  Proper flake8 fix
  fixes executing processes with correct PYTHONPATH will pickup .pth files
  Show the repo for bundled package file dump
  Proper flake8 fix
  ...
2015-09-03 15:46:10 -04:00
Chris Meyers
9f33127919 fixes jenkins failures
* include requirements.txt in requirements_jenkins.txt
* include requirements.txt in requirements_dev.txt
* alter Makefile to NOT call the requirements rule in the requirements_*
rules. Again, this is now handled by the -r requirements.txt in the
respective _*.txt file.
* install jenkins requirements "globally" (in the virtualenv)
2015-09-02 08:23:11 -04:00
James Laska
3ecfb0ce01 Include DIST_FULL in the offline symlink 2015-08-31 20:43:44 -04:00
James Laska
2b5624daa2 Improve RPM_DIST regular expression 2015-08-31 13:16:59 -04:00
James Laska
797aa9b5d8 Cleanup of Makefile offline-tar-build target 2015-08-31 13:04:11 -04:00
James Laska
597d37dd25 Fix typo in Makefile 2015-08-31 12:52:12 -04:00
James Laska
23b3b3fca6 Attempt to simplify offline Makefile target 2015-08-31 12:01:15 -04:00
James Laska
64b65edf2c Handle /bin/sh as the default shell
Fixes a build issue on Ubuntu where the `source` function isn't available
within `/bin/sh` (ubuntu).
2015-08-27 11:18:38 -04:00
James Laska
265802322d Add a new default build target
Also override dh_auto_clean to avoid removing the awx/ui/dist during DEB
package builds.

Update the `.spec` file to call the same Makefile targets used by in `debian/rules`.
2015-08-26 21:34:15 -04:00
James Laska
32a4a941e0 Gather pip requirements at package build time
Previously, requirements were gathered prior to the `sdist` target, and
included in the sdist tarball.  As some requirements are compiled, this caused
problems where the compiled dependencies were linked against the wrong
libraries.  This pull-request addresses that by moving the requirements
gathering into the `dh_prep` and `%build` steps of the packaging process.
2015-08-26 12:13:59 -04:00
Chris Meyers
30dc5ec434 remove hard coded epel6 build; support epel 7
* corrects epel7 testing .repo
2015-08-24 11:45:38 -04:00
Matthew Jones
1ead738f96 Updates to offline packager docker environment 2015-08-21 16:40:35 -04:00
Chris Meyers
a9e4377683 removed need for DIST and DIST_MAJOR specification 2015-08-20 10:46:04 -04:00
Chris Meyers
59b5722838 init offline installer builder 2015-08-20 10:41:28 -04:00
Chris Meyers
e80dcd9645 reference requirements in requirements_dev 2015-08-18 16:21:24 -04:00
James Laska
2de6be9cfe Simplify Makefile requirements targets 2015-08-17 14:13:44 -04:00
Matthew Jones
35ffb37492 Add cleaning site-packages in the Makefile 2015-08-17 11:33:45 -04:00
Chris Meyers
99fb641b1b all vendor dependencies expressed in requirements.txt 2015-08-17 11:17:53 -04:00
James Laska
719c2cd477 Remove stale comment in Makefile 2015-08-12 09:34:28 -04:00
James Laska
a1cbdebdd3 Simplify Makefile requirements targets 2015-08-12 08:35:42 -04:00
Matthew Jones
e5bd721b4b Add cleaning site-packages in the Makefile 2015-08-10 11:02:51 -04:00
Joe Fiorini
6d03deaf9b Fix testem.yml dependencies 2015-08-07 15:10:12 -04:00
Chris Meyers
fa1643e330 all vendor dependencies expressed in requirements.txt 2015-08-05 08:10:16 -04:00
Chris Church
71c2fd7f8d Add support for honcho as alternative to tmux for running development servers. 2015-08-04 15:26:27 -04:00
Joe Fiorini
b643dae4d5 Move testem.yml to packaging 2015-08-03 15:33:21 -04:00
Joe Fiorini
501612341c Accept mocha flags in node-tests task 2015-07-31 15:55:48 -04:00
Joe Fiorini
5c5e3f75f4 Add UI tasks to .PHONY 2015-07-30 08:47:32 -04:00
Joe Fiorini
2dc08339a8 Clean up UI-related make tasks 2015-07-28 15:55:00 -04:00
Joe Fiorini
a22e2760b9 Fix PATH setting 2015-07-27 10:19:16 -04:00
Joe Fiorini
8a29974a07 Ensure phantomjs is always found for testem 2015-07-27 10:19:16 -04:00
Joe Fiorini
57058493be Rename packaging folder for node stuff 2015-07-27 10:19:15 -04:00
Joe Fiorini
f360a625ea Get tests running again 2015-07-27 10:19:15 -04:00
Joe Fiorini
9cdea13057 Fix watcher to support new test builds 2015-07-27 10:19:15 -04:00
Joe Fiorini
6fec106fd7 Separate debug folder writing and debug mode 2015-07-27 10:19:14 -04:00
Joe Fiorini
b7c136aba7 Separate node test build from browser build 2015-07-27 10:19:14 -04:00
Joe Fiorini
811d0b1403 Build to awx/ui/static instead of dist 2015-07-27 10:19:14 -04:00
Joe Fiorini
79c6859810 Refactor Makefile to accept option overrides 2015-07-27 10:19:05 -04:00
Joe Fiorini
40acbcf256 Massive refactor of Brocfile for clarity 2015-07-21 16:28:12 -04:00
Joe Fiorini
c6549f4aca Allow tests to run in Phantom via testem for CI 2015-07-09 12:56:57 -04:00
Matthew Jones
074e66219d Add a docker development container build make target 2015-06-08 16:00:35 -04:00
James Laska
f02e26a3f7 Correct Makefile spacing 2015-06-08 11:39:01 -04:00
Matthew Jones
db5af80daa Conditionals on official builds for rpm-build 2015-06-01 16:00:11 -04:00
James Laska
3b9db54139 Add RPM-GPG-KEY to tower.repo
Includes supporting tasks in Makefile
2015-06-01 12:30:18 -04:00
James Laska
7064c9bed4 Additional flake8 cleanup
The flake8 command was identifying several warnings and errors. This change
addresses the flake8 warnings and updates the setup.cfg with additional
exclusions. If accepted, jenkins will be updated to use the flake8 command,
rather than using the django_jenkins plugin. This will expedite jenkins
testing.
2015-05-20 20:33:22 -04:00
James Laska
8ce0674f2c First pass at integration package vagrant workflow 2015-05-15 12:08:05 -04:00
Matthew Jones
c45a422590 Update "make server" endpoint and Makefile to include the new fact cache
receiver. Upgrade docker tool to install mongo and pymongo
2015-04-23 13:34:56 -04:00
Joe Fiorini
0535d1c8c9 Exclude sourcemaps from minjs builds 2015-04-22 15:15:44 -04:00
Joe Fiorini
d48fbaa6b4 Support build configuration allowing plato reports to run 2015-03-31 15:01:19 -04:00
Joe Fiorini
09d631c2c1 Support isolated build for documentation examples 2015-03-25 12:18:19 -04:00
Joe Fiorini
7b38bacca0 Uncomment and jshint ignore console statement 2015-03-13 11:50:35 -04:00
James Laska
8e31e88972 [jenkins] Don't install npm deps globally 2015-03-10 12:36:54 -04:00
Joe Fiorini
581f27f8b6 Automate cleanup of old dist directory 2015-03-02 16:58:34 -05:00
Joe Fiorini
f2b4590545 Allow all static files to be loaded from dist 2015-03-02 16:47:42 -05:00
Matthew Jones
c8682b7820 Take out this stupid sync_ui thing from the 'make server' and 'make
servercc' targets
2015-02-16 13:56:46 -05:00
Matthew Jones
0b8b39f951 Refactor logging to work primarily with rotating files instead of syslog 2015-02-13 10:30:01 -05:00
Joe Fiorini
f4dc7a1373 Add sane dependencies to UI-related Makefile targets 2015-02-11 10:16:12 -05:00
Matthew Jones
60ade410c1 Add tmux CC make target for using with the development service (make
servercc instead of make server)
2015-02-10 12:35:21 -05:00
Joe Fiorini
1689f18238 Also add package.json to .PHONY 2015-02-09 15:44:04 -05:00
Joe Fiorini
b2caa587b6 Adding node_modules to .PHONY target
This is a temporary fix until we figure out if we can make
packaging/grunt/package.template a dependency of package.json.
2015-02-09 15:44:04 -05:00
Joe Fiorini
217b237978 Improve output of watcher in tmux 2015-02-09 15:44:03 -05:00
Joe Fiorini
e3f3b4e78c Use custom watcher script for less CPU pegging 2015-02-09 15:44:03 -05:00
Joe Fiorini
fde020e178 Add target for running ui sync watcher 2015-02-09 11:20:48 -05:00
Joe Fiorini
43d6124153 Add target for ci to minify with tests 2015-02-09 09:45:23 -05:00
Joe Fiorini
4134857794 Point Makefile to local broccoli-cli install for jenkins 2015-02-06 16:52:41 -05:00
Joe Fiorini
54b5a89748 Move Brocfile to packaging 2015-02-06 12:49:04 -05:00
Joe Fiorini
81c940e36b Use broccoli for ui make tasks 2015-02-06 12:49:04 -05:00
James Laska
c841f08e5f Update requirements/jenkins.txt
Also, install (not upgrade), jenkins requirements in the Makefile
target.
2015-02-06 09:47:41 -05:00
Matthew Jones
888ae53027 Fix up flake8 runtime configuration, do a bit of flake8 work as it
relates to pyflakes)
2015-02-05 10:40:47 -05:00
Joe Fiorini
98a4f195c2 Add grunt task for running plato reports 2015-01-30 15:42:50 -05:00
Joe Fiorini
1809fec52e Setup testing for ci and development 2015-01-30 15:42:49 -05:00
Matthew Jones
bd542bc336 Update some of the dev requirements stuff 2015-01-30 10:52:35 -05:00
Luke Sneeringer
f890b6daa7 Shift makefile to hostname. 2014-12-02 11:20:03 -06:00
James Laska
4afa7a0d4d Remove AMI vars-aws-keys.json file
When building AMI using packer, the caller is responsible for setting
the required environment variables to make packer and AWS happy.  For
guidance, refer to https://www.packer.io/docs/builders/amazon-ebs.html.
2014-12-02 11:29:49 -05:00
James Laska
d47d2f5700 Add ansible-tower.{default,sysconfig} script
The 'ansible-tower' service script now comes with an additional file:

    /etc/{default,sysconfig}/ansible-tower

This file is used to specify the services managed by the 'ansible-tower'
service script.  The presence of this file allows admins (or the setup
playbook) to customize the services managed.  For example, when using a
remote postgres server, one would remove 'postgresql' from the list of
tower managed services.
2014-11-25 09:22:02 -05:00
James Laska
a40120d1cf Create latest setup symlink 2014-11-18 09:32:05 -05:00
James Laska
a63ec61fef Bind setup playbook with specific tower version
Trello: https://trello.com/c/cdcMpglV
2014-11-17 19:28:30 -05:00
James Laska
83c64dbd38 Fix mock build error
Mock doesn't seem to like a symlink.
2014-11-14 16:12:32 -05:00
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