External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-02-02 10:08:10 -03:30
Code Issues Packages Projects Releases Wiki Activity
21,898 Commits 55 Branches 102 Tags
c080346751b1316c04ea7602cf2b51150465a6ea
Commit Graph

21898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
beeankha
639e01e884 Remove unnecessary line 2019-04-25 16:26:58 -04:00
beeankha
e4d6d51cf5 Add further details/overview of AWX and Tower tasks into documentation 2019-04-25 16:14:49 -04:00
mabashian
7f452ee8d1 Add more sort options to new lists 2019-04-25 15:32:25 -04:00
Ryan Petrello
27d74528c0 Merge pull request #3494 from rooftopcellist/analytics_csv 
analytics table copies formatted as csv now
 2019-04-25 14:48:59 -04:00
Ryan Petrello
0ada1e965f Merge pull request #3508 from ryanpetrello/runner-134 
pin runner 1.3.4
 2019-04-25 10:16:05 -04:00
Ryan Petrello
2808a852eb pin runner 1.3.4 2019-04-25 09:49:03 -04:00
Ryan Petrello
80393e9194 Merge pull request #3504 from wenottingham/im-not-going-to-be-ignored-dan 
Kill the rabbitmq sos collection from our plugin.
 2019-04-24 14:51:01 -04:00
Bill Nottingham
aa52e41c02 Kill the rabbitmq sos collection from our plugin. 
It exists in upstream sosreport, and this can cause conflicts.
 2019-04-24 14:15:17 -04:00
Ryan Petrello
d7cdec37f2 Merge pull request #3502 from ryanpetrello/metrics-license-counts 
fix a few issues with license counts in /api/v2/metrics/
 2019-04-24 12:37:03 -04:00
softwarefactory-project-zuul[bot]
f60857013e Merge pull request #3754 from AlanCoding/gce_env_var 
Simplify gce inventory plugin injector

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-24 16:25:09 +00:00
Ryan Petrello
c9424f9af8 fix a few issues with license counts in /api/v2/metrics/ 
- switched these to gauges so people can track them over time
- fixed a typo that caused `free_instances` to always be zero
 2019-04-24 12:23:07 -04:00
Ryan Petrello
66f883befe Merge pull request #3485 from wenottingham/aaaaaaaaaaaaaaaaaaaaaaazure 
Update Azure requirements for Ansible stable-2.8 branch.
 2019-04-24 12:05:58 -04:00
softwarefactory-project-zuul[bot]
fad0274373 Merge pull request #3686 from vismay-golwala/instance_group_delete 
[WIP] Disallow deleting controller or isolated instance groups

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-24 15:19:19 +00:00
mabashian
e5dda696d7 Add new tests for rbac on some of the org pages 2019-04-24 10:10:14 -04:00
Michael Abashian
8c715fc6e1 Merge pull request #3497 from dsesami/e2e_backport_3.5.0 
E2E testing: compatibility edit to work with diff versions of node
 2019-04-24 10:03:53 -04:00
Daniel Sami
870ebb4b43 fix to work with diff versions of node 2019-04-24 09:44:41 -04:00
softwarefactory-project-zuul[bot]
e78ef82385 Merge pull request #3758 from ryanpetrello/dot-files 
clean up some old dotfiles

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-24 13:06:20 +00:00
Matthew Jones
1eb565543c Merge pull request #3495 from ansible/markerfiletest 
Adding a markerfile for e2e runs
 2019-04-24 09:06:03 -04:00
John Hill
082a819160 removing hyphen 2019-04-24 08:22:07 -04:00
Ryan Petrello
519d2eebcb remove unnecessary dotfiles 2019-04-23 17:23:15 -04:00
Michael Abashian
f2ea9003a3 Merge pull request #3493 from dsesami/e2e_backport_3.5.0 
E2E backport 3.5.0
 2019-04-23 16:51:34 -04:00
Christian Adams
64ae7a6e45 analytics table copies formatted as csv now 2019-04-23 16:26:14 -04:00
softwarefactory-project-zuul[bot]
b47be3c8c7 Merge pull request #3749 from AlanCoding/simple_openstack 
Use common method for openstack OS_CLIENT_CONFIG_FILE injection

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-23 20:23:05 +00:00
John Hill
2f7ec6ff13 adding a markerfile for e2e runs 2019-04-23 16:01:45 -04:00
Daniel Sami
75065b6407 e2e stability backport for 3.5 2019-04-23 15:45:27 -04:00
mabashian
82db7df6b3 Remove errant comment 2019-04-23 15:19:46 -04:00
mabashian
f57876b6d9 Fix existing test failures 2019-04-23 14:55:06 -04:00
softwarefactory-project-zuul[bot]
2cb6104fe4 Merge pull request #3696 from AlanCoding/django2_warnings 
Fix Django 2.0 deprecation warnings

Reviewed-by: https://github.com/softwarefactory-project-zuul[bot]
 2019-04-23 18:09:58 +00:00
softwarefactory-project-zuul[bot]
f90f8ba9a8 Merge pull request #3755 from ansible/noretry 
Adding an option to run all the tests without a retry statement

Reviewed-by: awxbot
             https://github.com/awxbot
 2019-04-23 17:48:52 +00:00
mabashian
38bb4f3f3c Fix merge conflicts 2019-04-23 13:27:00 -04:00
mabashian
5ae7cbb43a Add RBAC to org views 2019-04-23 13:19:34 -04:00
John Hill
9733fde560 Adding an option to run all the tests without a retry statement 2019-04-23 13:18:34 -04:00
Michael Abashian
1509ef3e80 Merge pull request #143 from mabashian/wizard-access-list 
Add roles modal to org access list
 2019-04-23 13:12:31 -04:00
mabashian
df87681e6d Fix linting errors 2019-04-23 12:20:08 -04:00
Ryan Petrello
231c76c9cb Merge pull request #3490 from jakemcdermott/fix-3487 
handle insights credential lookups for projects
 2019-04-23 12:08:43 -04:00
mabashian
621cc3f839 Fix rebase errors 2019-04-23 11:52:49 -04:00
Jake McDermott
311daf10b8 handle insights credential lookups for projects 
Although most scm types correspond to an scm credential lookup, insights uses its own
credential type.
 2019-04-23 11:44:03 -04:00
Bill Nottingham
4ca4563a19 Update Azure requirements for Ansible stable-2.8 branch. 2019-04-23 10:50:00 -04:00
Ryan Petrello
96183cf9c4 Merge pull request #3484 from ansible/insights-integration 
Insights integration
 2019-04-23 10:05:00 -04:00
mabashian
e8d73babaf Rebase and incorporates feedback 2019-04-23 10:01:03 -04:00
mabashian
9880f1e124 Removes the need to pass default search params to the select resource step 2019-04-23 10:01:03 -04:00
mabashian
a1002b03fa Add roles modal to org access list 2019-04-23 10:01:03 -04:00
Michael Abashian
47bdbddbeb Merge pull request #172 from jlmitch5/moveTestContext 
PR for moving tests to using new mountWithContext helper
 2019-04-23 09:58:15 -04:00
Michael Abashian
f7bd9af7a1 Merge branch 'master' into moveTestContext 2019-04-23 09:57:35 -04:00
Jeff Bradberry
0b555e938a Fix typo in the Insights inventory url 2019-04-23 09:39:08 -04:00
AlanCoding
c36dbb3448 Simplify gce inventory plugin injector 
This consumes the change made in Ansible core
https://github.com/ansible/ansible/pull/54407
which is in Ansible 2.8, allowing the plugin
injection logic to share the script logic and
to be simplified
 2019-04-23 09:33:17 -04:00
AlanCoding
adfce6edf1 Unify openstack inventory injection logic 
Remove logic specific to job runs to create a "clouds" file
  for openstack credential type

Move that logic into the collection of managed_by_tower
  injector methods, so it will be used by all job types

Modify inventory openstack injector logic to use this
  data as a base for its logic building the clouds file
 2019-04-23 07:59:47 -04:00
John Mitchell
261980f18e update components tests to use mountWithContexts when relevant 2019-04-22 16:34:33 -04:00
John Mitchell
986641de9f Fix ORganizationTeams test 2019-04-22 16:33:12 -04:00
John Mitchell
6f789b661f Fix NotificationList tests 2019-04-22 15:43:47 -04:00