External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-09-16 08:50:10 -02:30
Code Issues Packages Projects Releases Wiki Activity
15,740 Commits 65 Branches 102 Tags
47e422ba7a4601de99ed1c9231577dff99318e93
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Shane McDonald 47e422ba7a Merge pull request #819 from ansible/jakemcdermott-patch-1 
fix arg name clash in hosts list controller
 2017-12-13 13:02:47 -05:00
Shane McDonald 334d47f3ab Pull updated translations 2017-12-11 09:42:06 -05:00
Shane McDonald ec14ae1930 Add m2r to setup requirements file 
We `pip download` this file for offline installs. Automat lists this package as a setup_requires, but `pip download` doesn’t resolve these dependencies (distutils will attempt to install them via easy_install when setup.py is invoked).
 2017-12-05 15:26:56 -05:00
Shane McDonald 15e8fd5eca Pull updated translations 2017-12-05 14:17:18 -05:00
Shane McDonald 3cd80ef67a Update pot files 2017-11-30 15:29:29 -05:00
Shane McDonald 32fcb84cf6 Merge pull request #722 from jakemcdermott/tools-awx-pycrypto 
add pycrypto distro package to tools awx container image
 2017-11-28 13:42:02 -05:00
Shane McDonald e2aa9dc599 Merge pull request #658 from shanemcd/devel 
Enable image stream lookups in AWX OpenShift Project
 2017-11-15 13:21:51 -05:00
Shane McDonald a043369d07 Enable image stream lookups in AWX OpenShift Project 
See the OpenShift docs on this for more info: https://docs.openshift.com/container-platform/3.6/dev_guide/managing_images.html#using-is-with-k8s

If you are not using OpenShift’s internal registry you will need to manually set awx_task_openshift_image and awx_web_openshift_image.
 2017-11-15 13:15:56 -05:00
Shane McDonald 0d86678a44 Fix OpenShift configmap 
These variables changed in 8faf588775
 2017-11-14 11:32:05 -05:00
Shane McDonald 386382c456 Merge pull request #619 from wwitzel3/devel 
Fix installer references to asgi_amqp
 2017-11-13 14:10:58 -05:00
Shane McDonald f97ca9c42f Fix the way we include i18n files in sdist 2017-10-06 11:57:08 -04:00
Shane McDonald 1e03654c0b Pull updated translations 2017-09-20 17:29:20 -04:00
Shane McDonald de2a77adec Merge pull request #140 from eikef/delegate_sdist_localhost 
Make sure sdist builder image and AWX distribution are built locally
 2017-09-12 15:34:35 -04:00
Shane McDonald f2ddf2af95 Fix selinux issue w/ docker volume in sdist builder 
See https://www.projectatomic.io/blog/2015/06/using-volumes-with-docker-can-cause-problems-with-selinux/
 2017-09-11 15:11:03 -04:00
Shane McDonald 3e50a5da70 Merge pull request #104 from shanemcd/sdist-builder-image 
Build sdist inside of a container
 2017-09-11 09:29:46 -04:00
Shane McDonald b8e628958e Update INSTALL.md 
These dependencies are unnecessary now that we are building the sdist inside of a container.
 2017-09-11 08:42:56 -04:00
Shane McDonald a1bd84af5e Build sdist inside of a container 
A lot of people have experienced issues with the system-level dependencies that are required in order to build the source distribution that is handed off to the image builds. This makes it unnecessary to install any additional software on the host machine aside from Ansible and Docker.
 2017-09-10 19:00:33 -04:00
Shane McDonald df8ab0d9a9 Pull Dutch and Spanish translations 2017-09-06 14:46:06 -04:00
Shane McDonald 2419e5594b Update QA'd Japanese translations. 2017-08-31 10:08:22 -04:00
Shane McDonald d3507eb42c Pull updated Japanese and French translation files. 2017-08-30 09:53:56 -04:00
Shane McDonald d5c1f34016 Update pot files 2017-08-27 15:32:21 -04:00
Shane McDonald 16ef7e1950 Remove EULA 
Rather than deleting this file we are just removing the content, so that existing references to the file do not break.
 2017-08-22 13:59:44 -04:00
Shane McDonald da18033a46 Make parent image tag for unit tests a build arg 2017-08-17 09:16:52 -04:00
Shane McDonald 7ac2376a01 Make parent image tag for unit tests a build arg 2017-08-16 22:31:15 -04:00
Shane McDonald 5dfa54943d Merge pull request #244 from ansible/pycrypto 
Add pycrypto to Tower's requirements files
 2017-08-10 18:53:19 -04:00
Shane McDonald b02a6388d4 Pull updated po files from Zanata 2017-08-10 17:44:50 -04:00
Shane McDonald 5af04e3164 Add pycrypto to Tower's requirements files 
This is needed for GCE inventory syncs to work. Inventory Syncs run through the Tower virtual environment.
 2017-08-10 09:10:10 -04:00
Shane McDonald 00283b00dc Merge pull request #218 from shanemcd/fix-openshift-image-builds 
Fix OpenShift container image builds
 2017-08-07 22:07:40 -04:00
Shane McDonald f4aacebb86 Fix OpenShift container image builds 2017-08-07 17:31:18 -04:00
Shane McDonald 0711c87290 Merge pull request #173 from ansible/container_and_pod_fixes 
Updates to production container builds for new repository
 2017-08-04 19:50:54 -04:00
Shane McDonald 9c56a18ced Remove PACKAGE_BUILD logic from Makefile 
Also fix some whitespace
 2017-08-03 16:22:59 -04:00
Shane McDonald f13c56e3d9 Fix docdir location 2017-08-03 16:18:55 -04:00
Shane McDonald ac9fcdb63e Bump setuptools version 
This addresses a bug I was seeing when running `pip download setuptools --no-binary=:all:`.
 2017-08-01 10:13:04 -04:00
Shane McDonald 088f937590 Update pot files 2017-07-28 15:03:46 -04:00
Shane McDonald 97b7321920 Cleaning up Makefile 
Removing references to and definitions of unused targets
 2017-07-27 16:46:40 -04:00
Shane McDonald 1b8b6e1159 Remove default goal from makefile 
There is no build target anymore
 2017-07-27 16:32:09 -04:00
Shane McDonald f3130e06c9 Add i18n flag file back to makefile 
This was accidentally deleted during the repo split
 2017-07-27 16:30:29 -04:00
Shane McDonald c8b0142929 Fix test failures 2017-07-27 11:39:00 -04:00
Shane McDonald e904d47122 Fix unit test runs 2017-07-25 14:01:43 -04:00
Shane McDonald 1249a8b30f Rename tower-python to awx-python 2017-07-25 13:31:52 -04:00
Shane McDonald d13ff93f26 Merge pull request #42 from shanemcd/fix-sdist-version 
Fix reported version when installing from sdist
 2017-07-25 11:16:56 -04:00
Shane McDonald 9979513e24 Remove unused variable from setup.py invocations 2017-07-25 11:10:18 -04:00
Shane McDonald 3f3b02dbea Fix whitespace 2017-07-25 11:10:18 -04:00
Shane McDonald 7695cb6419 Fix version when installing from sdist 
When installing an sdist, setup.py is invoked on the machine you're installing on. We extract the version from a git tag, but the repo is not included in the sdist. The git describe --long command will silently fail and cause the installed package to report version 0.0.0.0.
 2017-07-25 11:09:51 -04:00
Shane McDonald 1b2d0f9683 Fix flake8 error 2017-07-24 15:12:45 -04:00
Shane McDonald 17db724932 Make packaging work with our internal build systems 2017-07-21 21:27:02 -04:00
Shane McDonald 55ca8d439b Add i18n flag to gitignore 2017-07-20 19:59:27 -04:00
Shane McDonald 44a15b4dd2 Merge pull request #7193 from wenottingham/bundle-up 
Fix bundler for repos_el role refactor
 2017-07-20 11:01:57 -04:00
Shane McDonald 4a175222b5 Cache i18n make targets 2017-07-17 09:41:47 -04:00
Shane McDonald 3450937329 Install tower-license in debs 2017-07-14 11:35:24 -04:00
Shane McDonald d273272d9a Add tower-license as a source to the RPM 2017-07-14 11:35:24 -04:00
Shane McDonald 23a0a00bd2 Merge pull request #6772 from ansible/isolated-tower-instance-packaging 
Packaging updates for Isolated Instances
 2017-06-28 15:54:48 -04:00
Shane McDonald 4a8e8d4fbf ansible-tower-isolated RPM 2017-06-28 15:02:34 -04:00
Shane McDonald 4e24a77370 Clean up rpm-sign 2017-06-28 15:02:34 -04:00
Shane McDonald 066d2e87e3 Fix DEB builds 
I was upgrading virtualenv for good measure in 4545fc1da1488bb1623de82ad19f78702bd6df62, but didnt foresee it causing problems. I was wrong. Worked for everything except Trusty builds.
 2017-05-15 11:02:04 -04:00
Shane McDonald 81d10dd7f3 Add awx/ui/client/languages/ to ui-clean target 
These json files are generated at build time.
 2017-05-15 11:01:07 -04:00
Shane McDonald dfdf59bcf5 Fix RPM builds 
The version of setuptools bundled with virtualenv is broken. This fixes things for both online and offline pip installs.
 2017-05-11 14:26:52 -04:00
Shane McDonald 55c2f5a2d6 Install Twilio package from source. 
Someone uploaded a broken wheel to pypi...
 2017-05-09 08:41:57 -04:00
Shane McDonald 74636d3623 Merge pull request #6082 from shanemcd/5959 
Stop / start ansible-tower-service during restores
 2017-04-20 15:03:34 -04:00
Shane McDonald c14672b485 Merge pull request #6073 from ansible/pgdg96 
Postgres 9.6
 2017-04-20 13:34:01 -04:00
Shane McDonald 570b28f3e3 Merge pull request #6070 from shanemcd/fix-debian-builds 
Fix Ubuntu builds
 2017-04-20 11:50:03 -04:00
Shane McDonald 896460d32e Build psycopg2 from source 
Fixes Ubuntu build errors where dh_strip was choking on a shared object file.
 2017-04-20 11:15:21 -04:00
Shane McDonald 2cb88deee1 Merge pull request #6065 from shanemcd/updated-es-translations 
Updated Spanish translations
 2017-04-20 08:14:37 -04:00
Shane McDonald 08aada3362 Pull Spanish updates from Zanata 2017-04-20 08:05:14 -04:00
Shane McDonald 9831c4551d Merge pull request #6057 from shanemcd/external-db-restore 
Fix external database restores
 2017-04-19 10:09:46 -04:00
Shane McDonald 7de092ff37 Merge pull request #6044 from shanemcd/awx-user-supervisorctl 
Give awx ownership of supervisor.sock
 2017-04-17 17:31:55 -04:00
Shane McDonald 6b06e741e0 Update pot files 
Steps taken:

$ make docker-compose-test

Create /root/.config/zanata.ini (Obtained from https://translate.engineering.redhat.com/dashboard/settings/client)

Update .pot files:

$ make pot
$ make languages

Push to Zanata:

python tools/scripts/manage_translations.py push --both --lang es
 2017-04-10 20:08:34 -04:00
Shane McDonald 18fc209ef7 Merge pull request #5782 from wenottingham/español 
Spanish translation from alberto@oforte.net.
 2017-04-10 09:05:46 -04:00
Shane McDonald 65dd84ed92 Merge pull request #5937 from shanemcd/spec-file-template 
Render spec file through Jinja template
 2017-04-03 12:12:25 -04:00
Shane McDonald d600706150 Use jinja template for populating version and release in spec file 
These macros were intended to pull the version and release from a python file if they werent passed in with --define, but /usr/bin/python is not available at this point in the build process. I'm not sure when or if this ever worked. Perhaps before we were using mock.

This approach also works for our Brew builds, as we cannot specify a macro value at build time.
 2017-04-03 10:32:46 -04:00
Shane McDonald 10ddb35b8b Merge branch 'stable' into devel 2017-03-31 23:53:06 -04:00
Shane McDonald f087dd40e2 Sign all rpms 
:shame:
 2017-03-31 15:57:16 -04:00
Shane McDonald f92c17617c Merge pull request #5931 from shanemcd/fix-supervisor-service-name 
Fix ubuntu 14 restart service list pt 2
 2017-03-30 14:10:42 -04:00
Shane McDonald 5d8e4d0419 Add back SRC_ONLY_PKGS 
Ooops.
 2017-03-30 13:08:48 -04:00
Shane McDonald 8bab0a14ef Add requirements/vendor to gitignore 2017-03-29 14:30:58 -04:00
Shane McDonald 8c7947b1a8 Remove requirements/vendor on make clean. 2017-03-29 14:30:58 -04:00
Shane McDonald d9e65823ad Update brew-srpm target to generate local requirements files 
This looks pretty hairy, but essentially it's just re-invoking `pip download` with `--no-deps` so that I can record the name of the local archives that are created.
 2017-03-29 14:30:58 -04:00
Shane McDonald 93dda555f1 Get offline pip installs working 
I had to pull the git urls out of the main requirements files because in order to install offline (--no-index), we need pip to install from local package archives rather than cloning repo.

The weird `cat` thing going on in the Makefile is because we need to install everything as part of a single `pip install` transaction. Without this, installing only requirements_git.txt will result in dependencies getting unintentionally updated.
 2017-03-29 14:30:58 -04:00
Shane McDonald 83919682ea Add clean-dist target 2017-03-29 14:30:58 -04:00
Shane McDonald fd3daa5b21 Merge pull request #5882 from shanemcd/setup-subpackage 
Setup subpackage
 2017-03-24 11:53:19 -04:00
Shane McDonald 0e2a2d61e2 Create a setup subpackage 2017-03-23 16:46:25 -04:00
Shane McDonald 114340753d Merge pull request #5875 from shanemcd/ui-subpackage 
Server and UI subpackages
 2017-03-23 16:45:55 -04:00
Shane McDonald fac387dae6 Merge pull request #5813 from shanemcd/fix-bundle-installer 
Include postgresql-server in bundled repos
 2017-03-21 11:02:02 -04:00
Shane McDonald d76d55adaf Add brew-srpm target 2017-03-15 11:06:34 -04:00
Shane McDonald 7e1eeb994b Add make targets for vendoring python requirements 2017-03-15 11:04:54 -04:00
Shane McDonald f79cd028f0 Add separate requirements file for setup_requires stuff 
pip doesnt know how to resolve setup_requires dependencies.

we need this for offline pip installs when building in brew
 2017-03-15 11:04:54 -04:00
Shane McDonald c94f294d06 Use --ignore-installed when creating virtualenvs 2017-03-15 11:04:54 -04:00
Shane McDonald fbb6650ad0 Add PIP_OPTIONS 
This will allow us to conditionally pass in things like --no-index and --find-links, which will be necessary for building in Brew.
 2017-03-15 11:04:54 -04:00
Shane McDonald 092c0b739e Simplify requirements targets 
AFAIK, there is never a situation where VENV is going to be unset.
 2017-03-15 11:04:54 -04:00
Shane McDonald 4742cede0d Add pip and setuptools to requirements files 
These packages were getting silently updated, making vendoring these dependencies difficult.

This ensures that the expected versions of these packages are installed in the virtualenvs.
 2017-03-15 11:04:54 -04:00
Shane McDonald 90e30d348f Revert "Dont ignore installed packages when installing requirements" 
This reverts commit 4ffc1a41f454d511fc523aaf8d3ab65dbe45c80e.
 2017-03-13 16:21:27 -04:00
Shane McDonald 4875d60b97 Dont ignore installed packages when installing requirements 
This was causing some packages to get unexpectedly upgraded... probably not what we want.
 2017-03-13 16:00:47 -04:00
Shane McDonald 388b0fdf04 Force reinstall of setuptools and pip 
For some reason -I wasn't cutting it. Even though we were trying to install pip 8.1.2, this was happening:

Collecting pip==8.1.2
  Using cached pip-8.1.2-py2.py3-none-any.whl
Installing collected packages: pip
Successfully installed pip-9.0.1

¯\_(ツ)_/¯
 2017-03-11 19:06:28 -05:00
Shane McDonald 8a8901afe4 Default image tag for unit test container image. 2017-03-10 11:53:37 -05:00
Shane McDonald 87e6d12abb Make sure ui deps are built for jshint 2017-03-09 19:18:24 -05:00
Shane McDonald 53ef8072b8 Add awx/ui/coverage to clean target 2017-03-09 19:18:24 -05:00
Shane McDonald 02a86c1d96 Don't pre-build UI deps for unit tests 
I know, this sucks. I spent all day trying to get to the bottom of the CI failures that started happening the other day with no luck.

There is something going on with how we were moving the node_modules directory into the source tree from the pre-built location in /tmp. This was working, but then it broke. I hope to cycle back on this sometime next week if I have the time.
 2017-03-09 19:18:24 -05:00
Shane McDonald 053ecd1093 Make sure ui deps are built for jshint 2017-03-09 19:15:46 -05:00
Shane McDonald 323e8ad8f0 Add awx/ui/coverage to clean target 2017-03-09 18:54:24 -05:00
Shane McDonald 0970726fa6 Don't pre-build UI deps for unit tests 
I know, this sucks. I spent all day trying to get to the bottom of the CI failures that started happening the other day with no luck.

There is something going on with how we were moving the node_modules directory into the source tree from the pre-built location in /tmp. This was working, but then it broke. I hope to cycle back on this sometime next week if I have the time.
 2017-03-09 18:54:24 -05:00