From b6bd2113c59152e6ca3618abdaad9b4e80b164ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Franti=C5=A1ek=20Zatloukal?= Date: Thu, 11 Apr 2019 10:38:44 +0200 Subject: [PATCH] Taskotron: Switch fetch_activity.py to use Python 3 --- roles/taskotron/taskotron-trigger/files/fetch_activity.py | 4 ++-- .../taskotron-trigger/templates/fetch_activity.cron.j2 | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/roles/taskotron/taskotron-trigger/files/fetch_activity.py b/roles/taskotron/taskotron-trigger/files/fetch_activity.py index 5e5a86bc08..108b742a8b 100644 --- a/roles/taskotron/taskotron-trigger/files/fetch_activity.py +++ b/roles/taskotron/taskotron-trigger/files/fetch_activity.py @@ -2,7 +2,7 @@ import re import datetime import socket from optparse import OptionParser -from urlparse import urljoin +from urllib.parse import urljoin import resultsdb_api @@ -106,4 +106,4 @@ if __name__ == "__main__": time_span = opts.time + "," + time_now.isoformat() output = main(opts.resultsdb_url, opts.frontend_url, time_span) - print output, + print(output, end=' ') diff --git a/roles/taskotron/taskotron-trigger/templates/fetch_activity.cron.j2 b/roles/taskotron/taskotron-trigger/templates/fetch_activity.cron.j2 index 9fbe27c60a..4a0fe6a176 100644 --- a/roles/taskotron/taskotron-trigger/templates/fetch_activity.cron.j2 +++ b/roles/taskotron/taskotron-trigger/templates/fetch_activity.cron.j2 @@ -1 +1 @@ -0 0 * * * root python /root/fetch_activity.py -u {{ resultsdb_url }} -f {{ resultsdb_external_url }} -t 24 2>&1 | tee /root/fetch_activity_logs/$(date "+\%Y\%m\%d" -d "last day")_{{ deployment_type }}_activity | mailx -r taskotron@fedoraproject.org -s 'Taskotron status: {{ deployment_type|upper }} from '$(date "+\%Y-\%m-\%d" -d "last day") sysadmin-qa-members@fedoraproject.org +0 0 * * * root python3 /root/fetch_activity.py -u {{ resultsdb_url }} -f {{ resultsdb_external_url }} -t 24 2>&1 | tee /root/fetch_activity_logs/$(date "+\%Y\%m\%d" -d "last day")_{{ deployment_type }}_activity | mailx -r taskotron@fedoraproject.org -s 'Taskotron status: {{ deployment_type|upper }} from '$(date "+\%Y-\%m-\%d" -d "last day") sysadmin-qa-members@fedoraproject.org