Merge pull request #1855 from wlach/1301729-followup

Bug 1301729 - Followups to buildapi artifact deprecation
mozilla · Sep 15, 2016 · b6558c8 · b6558c8
2 parents 06035b4 + 246e11b
commit b6558c8
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 107 deletions.
diff --git a/tests/e2e/test_client_job_ingestion.py b/tests/e2e/test_client_job_ingestion.py
@@ -363,8 +363,8 @@ def test_post_job_artifacts_by_add_artifact(
         'step': 1
     }
 
-    check_artifacts(test_project, job_guid, JobLog.PARSED, 3,
-                    {'Bug suggestions', 'privatebuild', 'buildapi'},
+    check_artifacts(test_project, job_guid, JobLog.PARSED, 2,
+                    {'Bug suggestions', 'privatebuild'},
                     mock_error_summary)
 
     # ensure the parsing didn't happen

diff --git a/treeherder/model/derived/artifacts.py b/treeherder/model/derived/artifacts.py
@@ -258,9 +258,6 @@ def load_job_artifacts(self, artifact_data):
                             job=job,
                             title='buildbot_request_id',
                             value=str(buildbot_request_id))
-                    self._adapt_job_artifact_collection(
-                        artifact, job_artifact_list,
-                        job.project_specific_id)
                 else:
                     self._adapt_job_artifact_collection(
                         artifact, job_artifact_list,

diff --git a/treeherder/model/management/commands/migrate_buildapi_artifacts.py b/treeherder/model/management/commands/migrate_buildapi_artifacts.py