mozilla
/
treeherder
зеркало из https://github.com/mozilla/treeherder.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fixes for jobs to job in blobs... heh...

This commit is contained in:
Cameron Dawson 2013-04-26 15:19:13 -07:00
Родитель 25aee931be
Коммит af74656926
3 изменённых файлов: 5 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

3
tests/model/derived/test_objectstore_model.py
Просмотреть файл

@ -72,9 +72,6 @@ def test_process_objects(jm):
# just process two rows
jm.process_objects(2)
import time
time.sleep(60)
test_run_rows = jm.get_dhub(jm.CT_JOBS).execute(
proc="jobs_test.selects.jobs")
date_set = set([r['submit_timestamp'] for r in test_run_rows])

2
tests/sample_data/job_data.txt
Просмотреть файл

@ -1,4 +1,4 @@
{"sources": [{"commit_timestamp": 1366331469, "push_timestamp": 1366331469, "comments": "try: -b do -p macosx,macosx64,win32,linux,linux32 -u all -t none", "repository": "try", "revision": "12e26c5d0d57"}], "revision_hash": "28d50025d238a4410a844f11d6cec95cf2abf214", "jobs": [{"build_platform": {"platform": "OS X 10.6", "os_name": "mac", "architecture": "x86_64", "vm": false}, "submit_timestamp": 1366331470, "start_timestamp": 1366356690.0, "name": "reftest", "option_collection": {"debug": true}, "log_references": [{"url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/mduan@mozilla.com-5cfd4cc28845/try-macosx64-debug/try_lion-debug_test-reftest-bm75-tests1-macosx-build37.txt.gz", "name": "unittest"}], "who": "mduan@mozilla.com", "reason": "scheduler", "artifact": {}, "machine_platform": {"platform": "OS X 10.6", "os_name": "mac", "architecture": "x86_64", "vm": false}, "machine": "talos-r4-lion-010", "state": "TODO", "result": 0, "job_guid": "8cc1cfe5e467d45f220bc7e63781a375b5582d48", "product_name": "firefox", "end_timestamp": "1366334018"}]}
{"sources": [{"commit_timestamp": 1366331469, "push_timestamp": 1366331469, "comments": "try: -b do -p macosx,macosx64,win32,linux,linux32 -u all -t none", "repository": "try", "revision": "12e26c5d0d57"}], "revision_hash": "28d50025d238a4410a844f11d6cec95cf2abf214", "job": {"build_platform": {"platform": "OS X 10.6", "os_name": "mac", "architecture": "x86_64", "vm": false}, "submit_timestamp": 1366331470, "start_timestamp": 1366356690.0, "name": "reftest", "option_collection": {"debug": true}, "log_references": [{"url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/try-builds/mduan@mozilla.com-5cfd4cc28845/try-macosx64-debug/try_lion-debug_test-reftest-bm75-tests1-macosx-build37.txt.gz", "name": "unittest"}], "who": "mduan@mozilla.com", "reason": "scheduler", "artifact": {}, "machine_platform": {"platform": "OS X 10.6", "os_name": "mac", "architecture": "x86_64", "vm": false}, "machine": "talos-r4-lion-010", "state": "TODO", "result": 0, "job_guid": "8cc1cfe5e467d45f220bc7e63781a375b5582d48", "product_name": "firefox", "end_timestamp": "1366334018"}}
{"sources": [{"commit_timestamp": 1366332511, "push_timestamp": 1366332511, "comments": "Bug 856351 - Paris binding for DragEvent, r=peterv", "repository": "mozilla-inbound", "revision": "4b5381804b7c"}], "revision_hash": "97932524871cb0306f587baab1f4200dae27dffc", "jobs": [{"build_platform": {"platform": "2.2", "os_name": "android", "architecture": "ARMv7", "vm": false}, "submit_timestamp": 1366332549, "start_timestamp": 1366357753.0, "name": "jsreftest-1", "option_collection": {"opt": true}, "log_references": [{"url": "http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mozilla-inbound-android-noion/1366326906/mozilla-inbound_tegra_android-noion_test-jsreftest-1-bm22-tests1-tegra-build2402.txt.gz", "name": "unittest"}], "who": "sendchange-unittest", "reason": "scheduler", "artifact": {}, "machine_platform": {"platform": "2.2", "os_name": "android", "architecture": "ARMv7", "vm": false}, "machine": "tegra-206", "state": "TODO", "result": 0, "job_guid": "6ff0cc5fb09aed3ef2c1beaa408a478a83ba2f78", "product_name": "mobile", "end_timestamp": "1366334021"}]}
{"sources": [{"commit_timestamp": 1366332167, "push_timestamp": 1366332167, "comments": "Bug 856351 - Paris binding for DragEvent, r=peterv", "repository": "mozilla-inbound", "revision": "4b5381804b7c"}], "revision_hash": "97932524871cb0306f587baab1f4200dae27dffc", "jobs": [{"build_platform": {"platform": "2.2", "os_name": "android", "architecture": "ARMv7", "vm": false}, "submit_timestamp": 1366332191, "start_timestamp": 1366357394.0, "name": "plain-reftest-4", "option_collection": {"opt": true}, "log_references": [{"url": "http://ftp.mozilla.org/pub/mozilla.org/mobile/tinderbox-builds/mozilla-inbound-android-armv6/1366326906/mozilla-inbound_tegra_android-armv6_test-plain-reftest-4-bm19-tests1-tegra-build978.txt.gz", "name": "unittest"}], "who": "sendchange-unittest", "reason": "scheduler", "artifact": {}, "machine_platform": {"platform": "2.2", "os_name": "android", "architecture": "ARMv7", "vm": false}, "machine": "tegra-228", "state": "TODO", "result": 0, "job_guid": "a3c4ee0b561dd5a1c444b41424612d9bd6d4cd8d", "product_name": "mobile", "end_timestamp": "1366334024"}]}
{"sources": [{"commit_timestamp": 1366332895, "push_timestamp": 1366332895, "comments": "Bug 861317 - nsChildView::WillPaint terribly inefficient when drawing to titlebar. r=bgirard", "repository": "mozilla-inbound", "revision": "e75ff759c5c1"}], "revision_hash": "57c1fbabe544656b4edb96ad2c5678fda8c5e46d", "jobs": [{"build_platform": {"platform": "WINNT 6.3", "os_name": "win", "architecture": "x86_64", "vm": false}, "submit_timestamp": 1366332906, "start_timestamp": 1366358108.0, "name": "chromez", "option_collection": {"opt": true}, "log_references": [{"url": "http://ftp.mozilla.org/pub/mozilla.org/firefox/tinderbox-builds/mozilla-inbound-win32/1366328526/mozilla-inbound_win8_test-chromez-bm15-tests1-windows-build188.txt.gz", "name": "talos"}], "who": "sendchange", "reason": "scheduler", "artifact": {}, "machine_platform": {"platform": "WINNT 6.3", "os_name": "win", "architecture": "x86_64", "vm": false}, "machine": "t-w864-ix-079", "state": "TODO", "result": 0, "job_guid": "cd6e1a5dc81cc0279acf4a097ab9745ff45d708a", "product_name": "firefox", "end_timestamp": "1366334026"}]}

6
treeherder/model/derived/jobs.py
Просмотреть файл

@ -178,8 +178,10 @@ class JobsModel(TreeherderModelBase):
# Get/Set reference info
# set Job data
rdm = self.refdata_model
job = data["jobs"]
job = data["job"]
build_platform_id = rdm.get_or_create_build_platform(
job["build_platform"]["os_name"],
@ -252,7 +254,7 @@ class JobsModel(TreeherderModelBase):
log_ref["url"]
)
except KeyError:
except (KeyError, JobDataError):
# it is ok to have an empty or missing artifact
pass