You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kibble.apache.org by hu...@apache.org on 2018/02/16 18:18:26 UTC
[kibble-scanners] branch master updated (5229665 -> 103755f)
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/kibble-scanners.git.
from 5229665 fix queue avg calc, add date key
new cf24721 remove debug return
new 103755f add a timestamp for when we think the build finished.
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/plugins/scanners/jenkins.py | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
--
To stop receiving notification emails like this one, please contact
humbedooh@apache.org.
[kibble-scanners] 02/02: add a timestamp for when we think the
build finished.
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kibble-scanners.git
commit 103755f4cffeefa48b5224807e5c7f8f95c3fe4e
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Feb 16 19:18:17 2018 +0100
add a timestamp for when we think the build finished.
---
src/plugins/scanners/jenkins.py | 9 ++++++++-
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/src/plugins/scanners/jenkins.py b/src/plugins/scanners/jenkins.py
index 9d7f222..d28a414 100644
--- a/src/plugins/scanners/jenkins.py
+++ b/src/plugins/scanners/jenkins.py
@@ -87,16 +87,23 @@ def scanJob(KibbleBit, source, job, creds):
status = 'failed'
if build['result'] in ['ABORTED']:
status = 'aborted'
+
+ # Calc when the build finished (jenkins doesn't show this)
+ if completed:
+ FIN = int(build['timestamp']/1000) + build['duration']
+ else:
+ FIN = 0
doc = {
# Build specific data
'id': buildhash,
+ 'date': time.strftime("%Y/%m/%d %H:%M:%S", time.gmtime(FIN)),
'buildID': build['id'],
'completed': completed,
'duration': build['duration'],
'job': job['name'],
'status': status,
- 'started': build['timestamp'],
+ 'started': int(build['timestamp']/1000),
'ci': 'jenkins',
'queuetime': queuetime,
--
To stop receiving notification emails like this one, please contact
humbedooh@apache.org.
[kibble-scanners] 01/02: remove debug return
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
humbedooh pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kibble-scanners.git
commit cf24721f7ebe219e20266d0c0f13204510129671
Author: Daniel Gruno <hu...@apache.org>
AuthorDate: Fri Feb 16 19:16:10 2018 +0100
remove debug return
we want this to actually scan :)
---
src/plugins/scanners/jenkins.py | 3 ---
1 file changed, 3 deletions(-)
diff --git a/src/plugins/scanners/jenkins.py b/src/plugins/scanners/jenkins.py
index 6553a61..9d7f222 100644
--- a/src/plugins/scanners/jenkins.py
+++ b/src/plugins/scanners/jenkins.py
@@ -230,9 +230,6 @@ def scan(KibbleBit, source):
}
KibbleBit.append('ci_queue', queuedoc)
- if True:
- return True
-
pendingJobs = jobsjs.get('jobs', [])
KibbleBit.pprint("Found %u jobs in Jenkins" % len(pendingJobs))
--
To stop receiving notification emails like this one, please contact
humbedooh@apache.org.