1
0
mirror of https://github.com/ansible/awx.git synced 2024-10-31 23:51:09 +03:00
Commit Graph

21116 Commits

Author SHA1 Message Date
softwarefactory-project-zuul[bot]
38aedcdd48
Merge pull request #4136 from Spredzy/revert_makefile
Revert "Makefile: align pip and setuptools bump"

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-21 13:42:26 +00:00
softwarefactory-project-zuul[bot]
59bec99f4c
Merge pull request #4128 from tchellomello/k8s-annotations
Introduces the ability to pass annotations to the Kubernetes Ingress Controllers

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-21 13:14:47 +00:00
Yanis Guenane
78912d20f7 Revert "Makefile: align pip and setuptools bump"
This reverts commit ec92abf014.
2019-06-21 11:52:22 +02:00
Marcelo Mello
52712a0d9a Introduces the ability to pass annotations to the Kubernetes Ingress Controllers 2019-06-20 16:40:08 -04:00
softwarefactory-project-zuul[bot]
e269634afc
Merge pull request #4112 from jbradberry/fix-3603
Use the `in` operator to test against the Organization membership subquery

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-20 12:56:08 +00:00
softwarefactory-project-zuul[bot]
4daf574899
Merge pull request #4114 from shanemcd/revert-pip-and-setuptools
Revert pip and setuptools

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-20 02:42:04 +00:00
softwarefactory-project-zuul[bot]
067ba7f8fe
Merge pull request #4116 from tchellomello/ca_trust_dir_project_data_dir
Fixes ca_trust_dir and project_data_dir for Kubernetes

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-20 02:19:25 +00:00
Marcelo Mello
7d77727a60 project_data_dir is not required in the awx_task containers 2019-06-19 21:35:49 -04:00
Marcelo Mello
47560fdf7c Fixes ca_trust_dir and project_data_dir for Kubernetes 2019-06-19 21:21:35 -04:00
Shane McDonald
2882f4afb5 Revert "upgrade pip and setuptools"
This reverts commit 76ebcf914b.
2019-06-19 16:02:52 -04:00
Shane McDonald
aaceccc426 Revert "Fix offline builds"
This reverts commit fe850dff38.
2019-06-19 16:02:43 -04:00
softwarefactory-project-zuul[bot]
1f3242900a
Merge pull request #4098 from beeankha/any_notification_migration
Update "Notify On Start" Migration File

Reviewed-by: Ryan Petrello
             https://github.com/ryanpetrello
2019-06-19 19:57:12 +00:00
softwarefactory-project-zuul[bot]
e6232957b4
Merge pull request #4079 from ryanpetrello/ldap-setting-flake
work around a unit test that's periodically flaky

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-19 18:55:24 +00:00
Jeff Bradberry
1a72ff4c47 Use the in operator to test against the Organization membership subquery
If more than one Organization were selected by this subquery, then
Postgres would complain with "more than one row returned by a subquery
used as an expression".  We needed to allow for that case.

Annoyingly SQLite3 doesn't seem to care, so writing a py.test test to
exercise this isn't feasible under our current development setup.
2019-06-19 14:49:02 -04:00
softwarefactory-project-zuul[bot]
c585c3d07d
Merge pull request #4105 from rooftopcellist/fix_instance_counts
Fixes analytics & metrics instance specific job counts

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-19 16:49:09 +00:00
softwarefactory-project-zuul[bot]
1413c1be7b
Merge pull request #4074 from ryanpetrello/whoopsie
fix a bug introduced in the inventory source detail API by v1 removal

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-19 15:52:47 +00:00
Christian Adams
a5c057cc18 Fixes analytics & metrics instance specific job counts 2019-06-19 11:32:05 -04:00
softwarefactory-project-zuul[bot]
9c06dc7106
Merge pull request #4106 from shanemcd/fix-offline-builds
Downgrade pip

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-18 23:17:48 +00:00
Shane McDonald
fe850dff38 Fix offline builds
pip 19 added support for something called `pyproject.toml`. Several packages have been setting the option `build-backend = "setuptools.build_meta”` (bcrypt, attrs, jaraco) which seems to be the root of the problem when building from source. Until the community sorts this out I’m inclined to avoid pip 19.
2019-06-18 18:48:54 -04:00
beeankha
40840e3789 Update migration file to indicate there is no reverse function in case of a rollback 2019-06-18 12:57:50 -04:00
softwarefactory-project-zuul[bot]
e3750f541e
Merge pull request #4096 from mabashian/4091-workflow-form
Fix field enablement on workflow form

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-18 16:15:57 +00:00
softwarefactory-project-zuul[bot]
5d49fe2170
Merge pull request #4097 from shanemcd/five-dot-oh-dot-oh
Bump version to AWX 5.0.0

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-18 14:43:25 +00:00
softwarefactory-project-zuul[bot]
ca0e8102fd
Merge pull request #3982 from beeankha/notify_on_start
Notification On Job Start

Reviewed-by: Bianca Henderson <beeankha@gmail.com>
             https://github.com/beeankha
2019-06-18 14:23:58 +00:00
Shane McDonald
08aff9bd2c AWX 5.0.0 2019-06-18 10:12:42 -04:00
mabashian
164d305b51 More canAddWorkflowJobTemplate cleanup 2019-06-18 09:16:19 -04:00
mabashian
4d33e484d0 Fix field enablement on workflow form 2019-06-18 09:10:49 -04:00
softwarefactory-project-zuul[bot]
1897b18a6e
Merge pull request #4090 from Spredzy/bump_pip
Makefile: align pip and setuptools bump

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-17 20:52:44 +00:00
Yanis Guenane
ec92abf014 Makefile: align pip and setuptools bump
Signed-off-by: Yanis Guenane <yanis@guenane.org>
2019-06-17 21:58:42 +02:00
softwarefactory-project-zuul[bot]
5ed7db8cc2
Merge pull request #4085 from mabashian/4082-inv_obj
Ensure inventory_obj is on scope before checking it

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-17 18:08:43 +00:00
beeankha
69502bc133 Add functions in migration file for deleting and altering 'any' state notifications 2019-06-17 10:47:58 -04:00
beeankha
17c89ed412 Remove tests for 'any' notification state 2019-06-17 10:47:58 -04:00
beeankha
f5b6bd65cf More deletions of 'any' state 2019-06-17 10:47:58 -04:00
beeankha
c6f1806a23 Removing references to 'any' state notifications 2019-06-17 10:47:58 -04:00
beeankha
c65e6ba30b Update the logic for 'any' and 'started' notifications 2019-06-17 10:47:58 -04:00
beeankha
d511d63a5a Fixed typo 2019-06-17 10:47:58 -04:00
beeankha
30741e762a Add more notification tests 2019-06-17 10:47:58 -04:00
beeankha
7687eddf6d Add api test, edit AWX docs 2019-06-17 10:47:58 -04:00
beeankha
9cfed6f2a8 Add check for no-op case back, remove redundant on_commit code 2019-06-17 10:47:58 -04:00
beeankha
95896b1acd Edit wfj running notification trigger 2019-06-17 10:47:58 -04:00
beeankha
68fe23d8b7 Update Organization Notification Template subclass, move success/fail wfj notification trigger 2019-06-17 10:47:58 -04:00
beeankha
dd372548a9 Update swagger test 2019-06-17 10:47:57 -04:00
beeankha
8d6e1f0927 Trigger running notifications in WFJs and edit unit test 2019-06-17 10:47:57 -04:00
beeankha
98fa1fc813 Add migration file 2019-06-17 10:47:57 -04:00
beeankha
8ec97235e3 Add feature for notifications to trigger on job start 2019-06-17 10:47:57 -04:00
mabashian
863d962ec2 Ensure inventory_obj is on scope before checking it 2019-06-17 07:40:08 -04:00
softwarefactory-project-zuul[bot]
049b3a2e87
Merge pull request #4080 from AlanCoding/no_more_v1
Remove code used defunct jobs list POST

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-15 01:02:24 +00:00
AlanCoding
196b6572b2
remove code used defunct jobs list POST 2019-06-14 13:13:37 -04:00
softwarefactory-project-zuul[bot]
37cb912367
Merge pull request #4075 from ryanpetrello/old-migration-cleanup
delete a few really old migration utility files

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
2019-06-14 14:27:47 +00:00
Ryan Petrello
d8bd72054d
work around a unit test that's periodically flaky 2019-06-14 10:05:41 -04:00
softwarefactory-project-zuul[bot]
9958f382d7
Merge pull request #4043 from mabashian/4029-inv-refresh
Fixes bug where the delete inventory event would wipe or reset inventory form fields

Reviewed-by: Michael Abashian
             https://github.com/mabashian
2019-06-14 14:04:59 +00:00