External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity
33,269 Commits 54 Branches 19 Tags
Commit Graph

33269 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Rominger
bf5594e338
Merge pull request #13930 from sean-m-sullivan/collection_role_update 
In collection, allow roles to be added to multiple teams and users
 2023-05-02 12:54:22 -04:00
Alan Rominger
f012a69c93
Allow running AWX checks on forks (#13938) 2023-05-02 11:47:29 -04:00
sean-m-sullivan
0fb334e372 collection, allow roles to be added to multiple teams and users 2023-05-02 07:34:38 -04:00
Sarah Akus
eb7407593f
Merge pull request #13915 from marshmalien/10877-dup-freq-types-schedule 
Show schedule details warning when RRule is unsupported
 2023-04-28 14:21:23 -04:00
Sarah Akus
287596234c
Merge pull request #13874 from marshmalien/8898-fix-update-vault-credentials 
Fix vault credential update error when vault_id is missing
 2023-04-28 13:50:46 -04:00
Sarah Akus
ee7b3470da
Merge pull request #13873 from marshmalien/10799-bug-prompt-launch-credential-type-dropdown-complete 
Fix screen crash when changing credential type in launch prompt dropdown
 2023-04-28 13:25:40 -04:00
Jessica Steurer
0faa1c8a24
Merge branch 'devel' into 8898-fix-update-vault-credentials 2023-04-28 10:37:15 -03:00
Alan Rominger
77175d2862
Consolidate get_queryset methods (#13906) 
In a prior merge, we added the ability to slap filter_read_permission = False on a view to get a certain functionality where it didn't filter a sublist the view is showing.

This logic already existed in a highly duplicated form among a number of views, so this deletes those methods in favor of the flag.
 2023-04-28 09:10:18 -04:00
Klaas Demter
22464a5838
Enhance secret retrieval documentation (#13914) 2023-04-26 19:32:40 +00:00
Sarah Akus
3919ea6270
Merge pull request #13905 from vidyanambiar/topology-rbac 
Make Topology view and Instances visible only to system admin/auditor
 2023-04-26 15:13:32 -04:00
Marliana Lara
9d9f650051
Show schedule details warning when RRule is unsupported 2023-04-26 14:49:43 -04:00
jessicamack
66a3cb6b09
Merge pull request #13858 from jessicamack/13322-catch-sigterm 
Catch SIGTERM or SIGINT and send offline message
 2023-04-26 12:24:34 -04:00
jessicamack
d282393035 change exit code 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-04-26 11:37:59 -04:00
jessicamack
6ea3b20912 reverse previous commit to break into separate PR 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-04-26 11:37:59 -04:00
jessicamack
3025ef0dfa move with block inside of while to free up persistent db connection 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-04-26 11:37:59 -04:00
jessicamack
397d58c459 removed TODO. moved signal catches to handle() 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-04-26 11:37:59 -04:00
jessicamack
d739a4a90a updated black and ran again to fix lint formatting 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-04-26 11:37:59 -04:00
jessicamack
3fe64ad101 fix signal handler. black reformats 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-04-26 11:37:59 -04:00
jessicamack
919d1e5d40 catch SIGTERM or SIGINT and send offline message 
Signed-off-by: jessicamack <jmack@redhat.com>
 2023-04-26 11:37:59 -04:00
John Westcott IV
7fda4b0675
Merge pull request #13903 from john-westcott-iv/collection_intergration_tests 
Enhance collection intergration tests
 2023-04-26 09:08:00 -04:00
Gabriel Muniz
d8af19d169
Fix organization not showing all galaxy credentials for org admin (#13676) 
* Fix organization not showing all galaxy credentials for org admin

* Add basic test to ensure counts

* refactored approach to allow removal of redundant code

* Allow configurable prefetch_related

* implicitly get related fields

* Removed extra queryset code
 2023-04-25 15:33:42 -04:00
Vidya Nambiar
1821e540f7
Merge branch 'devel' into topology-rbac 2023-04-25 15:32:17 -04:00
Vidya Nambiar
77be6c7495 tests 2023-04-25 14:18:05 -04:00
John Westcott IV
baed869d93 Remove project_manual integration test 
This test can no longer be performed without manual intervention because of how jobs are now run in EEs
 2023-04-25 13:49:50 -04:00
John Westcott IV
b87ff45c07 Enhance collection test 
ad_hoc_command_cancel really can no longer timeout on a cancel (it happens sub second) and remove unneeded block

Modified all test to respect test_id parameter so that all tests can be run togeather as a single ID

Fix a check in group since its group2 is deleted from being a sub group of group1

The UI now allows to propage sub groups to the inventory which we may want to support within the collection

Only run instance integration test if we are running on k8s and assume we are not by default

Fix hard coded names in manual_project
 2023-04-25 13:48:37 -04:00
Alan Rominger
7acc0067f5
Remove Ansible config override to validate group names (#13837) 2023-04-25 13:37:13 -04:00
Alan Rominger
0a13762f11
Use separate module for pytest settings (#13895) 
* Use separate module for test settings

* Further refine some pre-existing comments in settings

* Add CACHES to setting snapshot exceptions to accommodate changed load order
 2023-04-25 13:31:46 -04:00
Vidya Nambiar
2c673c8f1f Make Topology view and Instances visible only to system admin/auditor 2023-04-25 12:44:27 -04:00
John Westcott IV
8c187c74fc
Adding "password": "$encrypted$" to user serializer (#13704) 
Co-authored-by: Jessica Steurer <70719005+jay-steurer@users.noreply.github.com>
 2023-04-25 10:18:01 -03:00
Jesse Wattenbarger
2ce9440bab
Merge pull request #13896 from jjwatt/jjwatt-pyver 
Fallback on PYTHON path in Makefile
 2023-04-24 10:10:30 -04:00
Jesse Wattenbarger
765487390f Fallback on PYTHON path in Makefile 
- Change default PYTHON in Makefile to be ranked choice
- Fix `PYTHON_VERSION` target that expects just a word
- Use native GNU Make `$(subst ,,)` instead of `sed`
- Add 'version-for-buildyml' target to simplify ci

If I understand correctly, this change should make
'$(PYTHON)' work how we want it to everywhere. Before
this change, on develpers' machines that don't have
a 'python3.9' in their path, make would fail. With this
change, we will prefer python3.9 if it's available, but
we'll take python3 otherwise.
 2023-04-21 09:50:05 -04:00
Alan Rominger
086722149c
Avoid recursive include of DEFAULT_SETTINGS, add sanity test (#13236) 
* Avoid recursive include of DEFAULT_SETTINGS, add sanity test to avoid similar surprises

* Implement review comments for more clear code order and readability

* Clarify comment about order of app name, which is last in order so that it can modify user settings
 2023-04-20 15:15:34 -04:00
Sarah Akus
c10ada6f44
Merge pull request #13876 from marshmalien/9668-adhoc-credentials-search 
Fix credentials search in adhoc prompt modal
 2023-04-20 13:41:36 -04:00
Sarah Akus
b350cd053d
Merge pull request #13886 from marshmalien/fix-wf-approval-job-details 
Fix incorrect workflow approval job details
 2023-04-20 13:31:32 -04:00
Alan Rominger
d0acb1c53f
Delete cp of local_settings.py file in test running, because path no longer exists (#13894) 
* Change reference to moved local_settings.py file

* Do not appy local_settings to test runner
 2023-04-20 13:19:00 -04:00
Hao Liu
f61b73010a
Merge pull request #13889 from TheRealHaoLiu/egg-liminate 
Remove unnecessary egg-link linking
 2023-04-19 17:12:28 -04:00
Hao Liu
adb89cd48f Remove unnecessary egg-link linking 
we link awx.egg-link from `tools/docker-compose/awx.egg-link` to `/tmp/awx.egg-link` than we move `/tmp/awx.egg-link` to `/var/lib/awx/venv/awx/lib/python3.9/site-packages/awx.egg-link`

bonus... now we dont have to set PYTHON=python3.9
 2023-04-19 16:36:51 -04:00
Hao Liu
3e509b3d55
Merge pull request #13883 from ZitaNemeckova/remove_inventories_from_host_metrics 
Remove Inventories column for now
 2023-04-19 15:41:32 -04:00
Hao Liu
f0badea9d3
Merge pull request #13888 from TheRealHaoLiu/correct-make-call-make 
Make target should not call make directly
 2023-04-19 15:38:58 -04:00
Hao Liu
6a1ec0dc89
Merge pull request #13887 from TheRealHaoLiu/no-make-run-stuff-in-docker-compose 
Stop using make to start awx processes part 1
 2023-04-19 15:35:32 -04:00
Hao Liu
329fb88bbb Make target should not call make directly 
https://www.gnu.org/software/make/manual/html_node/MAKE-Variable.html

make target should always call make with $(MAKE)
 2023-04-19 15:01:16 -04:00
Hao Liu
177f8cb7b2 Stop using make to start processes 
part 1...

we dont need to run awx processes through make
because awx-manage uses awx-python which is already activating the correct venv
 2023-04-19 14:51:38 -04:00
Marliana Lara
b43107a5e9
Fix credentials search in adhoc prompt modal 2023-04-19 13:59:08 -04:00
Marliana Lara
4857685e1c
Fix vault credential update server error 2023-04-19 13:58:39 -04:00
Marliana Lara
8ba1a2bcf7
Reset search params when prompt launch credential type dropdown changes 
* Fix credential validation bugs
 2023-04-19 13:58:11 -04:00
Marliana Lara
e7c80fe1e8
Fix incorrect workflow approval job details 2023-04-19 13:57:05 -04:00
Hao Liu
33f1c35292
Merge pull request #13658 from TheRealHaoLiu/different-dockerfile 
Use different dockerfile for docker-compose-build
 2023-04-19 12:12:54 -04:00
Hao Liu
ba899324f2
Merge pull request #13856 from TheRealHaoLiu/kube-dev-autoreload 
Auto reload services in kube dev env
 2023-04-19 12:08:52 -04:00
Hao Liu
9c236eb8dd
Merge pull request #13882 from TheRealHaoLiu/link-launch-n-supervisord 
Link launch script and supervisor conf in kube dev
 2023-04-19 12:03:22 -04:00
Zita Nemeckova
36559a4539 Remove Inventories column for now. Revert this commit once the backend is ready. 2023-04-19 15:55:02 +02:00