Commit Graph
69 Commits
Author SHA1 Message Date
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
Shane McDonald 34990c304a Remove npm hacks from unit-test-runner
This hasnt been necessary for a while, just forgot it was here..
2017-03-08 15:40:49 -05:00
Shane McDonald 0fa4b16660 Rebuild unit-test image for every branch
This variable is set by Jenkins, you'll have to set it manually if you build locally.
2017-03-08 15:40:49 -05:00
Shane McDonald afb5658376 Remove npm hacks from unit-test-runner
This hasnt been necessary for a while, just forgot it was here..
2017-03-08 15:18:52 -05:00
Shane McDonald c25795d3fc Rebuild unit-test image for every branch
This variable is set by Jenkins, you'll have to set it manually if you build locally.
2017-03-08 15:18:21 -05:00
Shane McDonald 739f4e6a50 Add awx/ui/client/languages to .gitignore 2017-02-27 08:56:59 -05:00
Shane McDonald 87f60221ac Delete awx/ui/client/languages/*.json
This should have been in .gitignore
2017-02-27 08:56:25 -05:00
Shane McDonald 065bd6041c Default to empty string for UI language detection
When removing all “Languages” from Firefox, the UI breaks and you see an error in the console that says “langInfo is undefined”. This fixes that.
2017-02-14 16:54:32 -05:00
Shane McDonald be686e0acc Tweak logic used by UI to detect language
Chromium and WebKit based browsers have the window.navigator.languages attribute, which is an ordered array of preferred languages as configured in the browser’s settings.

Although changing the language in Chrome results in an Accept-Language header being added to requests, window.navigator.language still returns the language specified by the OS.

I’ve tested this with Firefox, Chrome, IE 11, and Edge.

Connect #5360
2017-02-14 15:37:52 -05:00
Shane McDonald 7282e4c332 Fix globbing pattern for l10n files
TIL **/* only searches direct child directories on Linux, but is recursive on macOS
2017-02-13 20:33:06 -05:00
Shane McDonald 409090789c Add l10n files to data_files in setup.py 2017-02-13 20:00:30 -05:00
Shane McDonald 60c163c892 Update pot files
String changed in becdc5128cd0de801c5d1e2f6503fc131d3c8969.
2017-02-09 09:37:21 -05:00
Shane McDonald b9d5e89ead Update en-us django po file 2017-01-31 16:05:59 -05:00
Shane McDonald 696353f77e Update django pot file 2017-01-31 16:05:59 -05:00
Shane McDonald b9f6368299 Update po files 2017-01-31 14:34:42 -05:00
Shane McDonald 94a03b640d Update pot files 2017-01-31 14:34:42 -05:00
Shane McDonald ece5299a74 Add gcc-c++ to development container 2017-01-31 13:09:59 -05:00
Shane McDonald a467d20341 Update po files 2017-01-27 13:34:09 -05:00
Shane McDonald 9ec99cd026 Update pot files 2017-01-27 13:34:09 -05:00
Shane McDonald dfd7b5ca62 Improve awx/ui/README.md 2017-01-25 18:45:48 -05:00
Shane McDonald 35deb0be37 Simplify UI / Docker targets
- Renamed npm scripts to reflect what they are actually doing. Nothing is being built here!
- Not sure why the default django_host was 0.0.0.0…
- Removed unnecessary logic from build-docker-cid
2017-01-25 18:45:48 -05:00
Shane McDonald 7776dc1304 Remove SauceLabs stuff from package.json 2017-01-25 18:45:48 -05:00
Shane McDonald f9573db5a3 Regenerate npm-shrinkwrap.json
This file was originally generated with a version of NPM that was affected by a bug that would cause `npm install` to fail on non-macOS systems. We were temporarily forced to downgrade to 3.10.7, but…. this fixes that! Verified on macOS Sierra and CentOS 7 using NPM version 3.10.10.
2017-01-25 18:45:47 -05:00
Shane McDonald 790f30b3cd Prevent npm install from running every time make ui-docker* is invoked
awx/ui/package.json is a normal file in the repo, not created by Make.
2017-01-25 18:45:47 -05:00
Shane McDonald 1cac3abc9f Whitespace fix in translation 2017-01-23 14:50:35 -05:00
Shane McDonald 483fbb6f24 Pull in latest translations 2017-01-23 12:25:57 -05:00
Shane McDonald b60b4b2bc1 Generate .mo files without django, enable API l10n at build time. 2017-01-23 12:25:56 -05:00
Shane McDonald 933512be63 Revert "Manually add .mo files (for now) to get API l10 working."
This reverts commit 3acb71784fdcaff34644b31fc1bdf4914229c503.

# Conflicts:
#	awx/locale/fr/LC_MESSAGES/ansible-tower-ui.mo
2017-01-23 12:25:56 -05:00
Shane McDonald ad4323ebb8 Update French .mo file 2017-01-19 15:54:58 -05:00
Shane McDonald 8b7435ccd3 Manually add .mo files (for now) to get API l10 working. 2017-01-13 14:49:40 -05:00
Shane McDonald e0cd4bc7ae Get Japanese API l10 working
Worked with matburt on this. There were some inconsistencies between our code and the po files.
2017-01-13 14:49:40 -05:00
Shane McDonald 6b0573da71 Uncomment line that requests UI l10n files. 2017-01-12 21:09:18 -05:00
Shane McDonald cbf0c2704d Separate API and UI l10n make targets.
A couple reasons for this:

- The command for generating the API l10n files is currently broken, and I want to get the translation folks looking at the UI ASAP.
- These things require different environments:
  - Generating the UI files requires Grunt, which is only available *before* packaging. We generate the static files before invoking mock or pbuilder.
  - Generating the API files requires Django, which is only available inside the virtual environment. This will likely need to be invoked somewhere inside of the install playbooks.
2017-01-12 21:09:18 -05:00
Shane McDonald 894577c89a Add Japanese and French po files for the UI. 2017-01-12 21:09:18 -05:00
Shane McDonald dfa85dbbd2 Merge pull request #1896 from shanemcd/expiration-date
*Really* display correct expiration date on license page.
2016-05-16 14:43:45 -04:00
Shane McDonald dacbeed5a4 Merge pull request #1886 from shanemcd/license-expiration-date
Fix license expiration date / time remaining
2016-05-11 10:25:48 -04:00
Shane McDonald 0a315f5c60 Merge pull request #1770 from shanemcd/prevent-orphaned-supervisor-processes
Fix supervisor restarts / prevent orphaned processes.
2016-05-03 10:13:01 -04:00
Shane McDonald 629c46fb0c Merge pull request #1501 from shanemcd/fix-ami-install-script
Make Packer inventory consistent with setup/inventory
2016-04-12 11:51:24 -04:00
Shane McDonald 81268f7106 Merge pull request #1497 from shanemcd/remove-unnecessary-config-play
Remove unnecessary play in configuration playbook.
2016-04-12 09:35:22 -04:00
Shane McDonald 0a15ece049 Merge pull request #1483 from shanemcd/packer-centos7
Use CentOS 7 as source AMI in Packer template.
2016-04-11 15:06:23 -04:00