External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-17 20:51:21 -03:30
Code Issues Packages Projects Releases Wiki Activity
26,472 Commits 54 Branches 19 Tags
Commit Graph

26472 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
softwarefactory-project-zuul[bot]
8612bf79e8
Merge pull request #5295 from rooftopcellist/analytics_user_agent 
Add User-Agent to analytics upload POST

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-26 20:04:17 +00:00
softwarefactory-project-zuul[bot]
78edf51803
Merge pull request #5397 from rooftopcellist/consolidate_canceled 
Make spelling of canceled consistent

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-26 19:55:53 +00:00
Ryan Petrello
632810f3a8
fix a few bugs with the session and oauth2 cleanup scheduled jobs 
see: https://github.com/ansible/tower/issues/3940
 2019-11-26 13:17:46 -05:00
AlanCoding
695eab1fdd
fix duplicate exception sanity error 2019-11-26 09:47:07 -05:00
AlanCoding
081a0fc04e
fix other assorted sanity failures 2019-11-26 09:45:54 -05:00
AlanCoding
48f10669d6
fix duplicate exception sanity error 2019-11-26 09:39:05 -05:00
Christian Adams
4f8b624b96 Make spelling of canceled consistent 2019-11-26 00:31:15 -05:00
softwarefactory-project-zuul[bot]
c87c0aa712
Merge pull request #5395 from AlanCoding/you_are_migrating 
Raise specific exception if migration in progress

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-26 03:40:43 +00:00
Christian Adams
05e6f4ab3c Add User-Agent to analytics upload POST 2019-11-25 22:22:05 -05:00
AlanCoding
1a85874964
Raise specific exception if migration in progress 2019-11-25 21:48:05 -05:00
softwarefactory-project-zuul[bot]
6f2224c8e5
Merge pull request #5393 from shanemcd/fix-version-in-dev 
Fix VERSION reported in dev container

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-25 22:36:22 +00:00
softwarefactory-project-zuul[bot]
57e155f0f9
Merge pull request #5396 from wenottingham/even-cleaner 
Clean up some stuff in awxkit with `make clean`

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-25 21:40:50 +00:00
softwarefactory-project-zuul[bot]
a6924c1bcf
Merge pull request #5394 from beeankha/fix_error 
Make Integration Tests Pass w/ Manual SCM Type

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-25 21:10:42 +00:00
Bill Nottingham
4acb28f6f5 Clean up some stuff in awxkit with make clean 2019-11-25 15:55:22 -05:00
beeankha
3ed5d6ec65 Make integrations pass even with manual SCM type 2019-11-25 15:16:41 -05:00
Shane McDonald
15bcea7301
Fix VERSION reported in dev container 2019-11-25 12:56:49 -05:00
Shane McDonald
ce8c0066d0
Fix downstream tests 
I backported how we do the VERSION detection in 3.5.something. This should
already be fixed upstream.
 2019-11-25 12:55:18 -05:00
softwarefactory-project-zuul[bot]
bdd63f36a8
Merge pull request #5366 from marshmalien/inv-hosts-list 
Inventory Host List

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-25 17:39:33 +00:00
Shane McDonald
24abc1462f
Merge pull request #3985 from shanemcd/fix-cache 
Fix Docker build caching
 2019-11-25 11:41:33 -05:00
Shane McDonald
12363ae175
Fix Docker build caching 
The flow will need to be:

- Pre-pull image you want to use
- Re-tag as image:$(COMPOSE_TAG)
- COMPOSE_TAG=mytag make docker-compose-build
 2019-11-25 11:32:41 -05:00
Marliana Lara
1b50895738
Use short circuit operator in favor of ternary conditional 2019-11-25 11:17:37 -05:00
Ryan Petrello
1fbae00e37
Merge pull request #3983 from ryanpetrello/fix-3980 
Remove usage of idle_timeout when checking status of isolated / containerized jobs
 2019-11-25 11:15:35 -05:00
Samir Jha
b10a71786b Update foreman inventory to use foreman's inventory report 2019-11-25 10:48:54 -05:00
Ryan Petrello
0d659b0111
Merge pull request #3984 from ryanpetrello/fix-3978 
Adds link to docs on container groups add/edit forms
 2019-11-25 10:42:59 -05:00
softwarefactory-project-zuul[bot]
deb8714987
Merge pull request #5390 from ryanpetrello/downstream-security 
merge in a few downstream fixes

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-25 15:38:25 +00:00
mabashian
ee8775a08d
Adds link to docs on container groups add/edit forms to match instance groups. Updates instance groups link. 2019-11-25 10:35:23 -05:00
Shane McDonald
31650bb0bd
Remove usage of idle_timeout when checking status of isolated / containerized jobs 2019-11-25 10:31:33 -05:00
Ryan Petrello
cbf085ab43
move migrations to accomdate a downstream migration 2019-11-25 10:06:12 -05:00
Ryan Petrello
78d715efed
merge downstream branch 2019-11-25 10:05:05 -05:00
softwarefactory-project-zuul[bot]
2cb5b0563b
Merge pull request #5377 from dsesami/new-ids 
Updated some selector attributes for E2E

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-25 14:00:50 +00:00
Daniel Sami
0eb55f5038
Updated contributing doc with notes about E2E 2019-11-22 15:24:35 -05:00
Daniel Sami
daf3bbc7ef Added E2E-friendly selectors to nav and jt details 
lint

updated snapshot
 2019-11-22 15:12:43 -05:00
softwarefactory-project-zuul[bot]
caa6d0c4d3
Merge pull request #5382 from shanemcd/take-your-time 
Remove usage of idle_timeout when checking status of isolated / containerized jobs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-22 18:37:14 +00:00
softwarefactory-project-zuul[bot]
bc7ae4ca46
Merge pull request #5173 from AlanCoding/collection_credentials 
Finish JT.credentials functionality, add test

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-22 18:07:14 +00:00
Shane McDonald
db2316b791
Remove usage of idle_timeout when checking status of isolated / containerized jobs 2019-11-22 11:41:00 -05:00
softwarefactory-project-zuul[bot]
b7efd5a9ab
Merge pull request #5332 from AlexSCorey/InventoryAdd/EditForm 
Adds Add/Edit Inventory and Inventory Form

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-22 16:00:35 +00:00
Alex Corey
83caf99c58 Improves Tests and addresses other PR Issues 2019-11-22 10:22:05 -05:00
softwarefactory-project-zuul[bot]
285fb2582e
Merge pull request #5378 from AlanCoding/run_notes 
Add notes for ./upgrade.sh

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-22 00:49:40 +00:00
Alex Corey
19180a1bc4 Adds Add/Edit Inventory and Inventory Form 2019-11-21 17:40:28 -05:00
AlanCoding
9c86f521e9
Add notes for ./upgrade.sh 2019-11-21 15:52:47 -05:00
David Moreau Simard
2171823846
Finish JT.credentials functionality, add test 
Original commit:

commit 3ec6196477135230c4b90b175310bdc2eaff36ed
Author: David Moreau Simard <dmsimard@redhat.com>
Date:   Tue Oct 23 22:21:33 2018 -0400

    Add support for "credentials" in the tower_job_template module

    Job templates might require more than one credential.
    There's credential, vault_credential, machine_credential, etc.
    "credentials" is a thing, let's support it.
 2019-11-21 14:30:08 -05:00
softwarefactory-project-zuul[bot]
c4143b0111
Merge pull request #5373 from rooftopcellist/rm_analytics_values 
Set default values for analytics settings

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-21 18:21:40 +00:00
Christian Adams
94fa4deab3 Set default values for analytics settings 2019-11-21 12:29:15 -05:00
softwarefactory-project-zuul[bot]
53aadd3b96
Merge pull request #5372 from mabashian/ig-docs-links 
Instance groups links to docs

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-21 17:08:21 +00:00
Marliana Lara
faa0802d97
Update breadcrumb and fetch new hosts when url changes 2019-11-21 11:36:18 -05:00
Marliana Lara
fa144aa98f
Add Inventory Host list and unit tests 
* Add Inventory Host Add route
* Fix host disabled loading switch bug
 2019-11-21 11:36:17 -05:00
Marliana Lara
ea4e98c52a
Move Switch into shared component directory and update tests 2019-11-21 11:36:12 -05:00
mabashian
8ff413efc0 Adds link to docs on container groups add/edit forms to match instance groups. Updates instance groups link. 2019-11-21 11:05:06 -05:00
softwarefactory-project-zuul[bot]
804a3c17bf
Merge pull request #5354 from wenottingham/isolation-desolation--let-it-go 
Remove obsolete requirements file.

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-21 13:35:09 +00:00
softwarefactory-project-zuul[bot]
da5eb710cd
Merge pull request #5358 from ilijamt/patch-1 
Allow deployments on Kubernetes version 1.16

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
 2019-11-21 13:27:15 +00:00