Skip to content

Commit 8a31c2d

Browse files
author
droberts2013
committed
Eliminate repetitive job output
1 parent de53bde commit 8a31c2d

File tree

3 files changed

+12
-8
lines changed

3 files changed

+12
-8
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ plugins {
1212
defaultTasks 'build'
1313
apply plugin: 'java'
1414

15-
version='1.1.4'
15+
version='1.1.5'
1616
sourceSets.main.resources.srcDirs = ["src"]
1717

1818
license {

src/ansibletower/launchAndWait.wait_for_completion.py

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,8 @@ def formatted_print(message):
3232
print("```")
3333
print("\n")
3434

35+
def print_job_output():
36+
3537
ansible_instance = AAPServer(ansibletower, username, password, apiToken)
3638
request = ansible_instance.create_request()
3739
headers = ansible_instance.create_header(request)
@@ -46,23 +48,25 @@ def formatted_print(message):
4648
api_url = '/api/v2/%s/%s/' % (status_path_component, job_id)
4749

4850
response = request.get(api_url, contentType='application/json',headers=headers)
51+
num_tries += 1
4952
if response.isSuccessful():
5053
result = json.loads(response.response)
5154
status=result['status']
52-
print status
53-
task.setStatusLine("Job id %s %s" % (job_id, status))
55+
task.setStatusLine("Job id %s %s" % (job_id, status))
56+
formatted_print(">>> Task status after " + str(num_tries) + " tries is "+ status)
57+
print(link_message % (str(job_id), ansibletower['url'], str(job_id)))
58+
print("\n")
5459
if status in ["running","pending","waiting"]:
55-
num_tries += 1
5660
if max_retries:
5761
if num_tries > max_retries:
62+
job_output=request.get(api_url+'stdout/', contentType='text/plain',headers=headers).response
63+
formatted_print(job_output)
5864
raise Exception("Error: maximum number of tries reached")
5965
task.schedule("ansibletower/launchAndWait.wait_for_completion.py", int(wait_interval))
6066
else:
67+
formatted_print(">>> Task failed after " + str(num_tries) + " tries.")
6168
raise Exception("Failed: Server return [%s], with content [%s]" % (response.status, response.response))
6269

63-
formatted_print(">>> Task completed after " + str(num_tries) + " tries with status "+ status)
6470
job_output=request.get(api_url+'stdout/', contentType='text/plain',headers=headers).response
6571
formatted_print(job_output)
66-
print(link_message % (str(job_id), ansibletower['url'], str(job_id)))
67-
print("\n")
6872
result= job_output

src/plugin-version.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
#SOFTWARE.
2222

2323
plugin=xlr-ansible-automation-controller-plugin
24-
version=1.1.4
24+
version=1.1.5
2525

0 commit comments

Comments
 (0)