tell Changes client to use path in artifact name for bazel projects

Summary: This passes an extra command line argument --use-path-in-artifact-name to Changes client.

Test Plan: unit tests

Reviewers: anupc

Reviewed By: anupc

Subscribers: changesbot, kylec

Differential Revision: https://tails.corp.dropbox.com/D223290

changes/buildsteps/default.py

@@ -75,6 +75,7 @@ def __init__(self, commands=None, repo_path=None, path=None, env=None,
                  max_executors=10, cpus=DEFAULT_CPUS, memory=DEFAULT_MEMORY_MB, clean=True,
                  debug_config=None, test_stats_from=None, cluster=None,
                  other_repos=None, artifact_search_path=None,
+                 use_path_in_artifact_name=False,
                  **kwargs):
         """
         Constructor for DefaultBuildStep.
@@ -132,6 +133,9 @@ def __init__(self, commands=None, repo_path=None, path=None, env=None,
                 can be specified with "revision".
             artifact_search_path: Absolute path in which test artifacts can be
                 found in. This defaults to the value for `path`.
+            use_path_in_artifact_name: Tell Changes client to append the hash
+                of the file path to the artifact name, before any file extension
+                or suffixes.
         """
         if commands is None:
             raise ValueError("Missing required config: need commands")
@@ -152,6 +156,7 @@ def __init__(self, commands=None, repo_path=None, path=None, env=None,
             self.repo_path = path or DEFAULT_PATH
             self.path = self.repo_path
         self.artifact_search_path = artifact_search_path if artifact_search_path else self.path
+        self.use_path_in_artifact_name = use_path_in_artifact_name
         self.release = release
         self.max_executors = max_executors
         self.resources = {
@@ -497,6 +502,7 @@ def get_allocation_params(self, jobstep):
             'post-launch': current_app.config['LXC_POST_LAUNCH'],
             'release': self.release,
             'use-external-env': 'false',
+            'use-path-in-artifact-name': 'true' if self.use_path_in_artifact_name else 'false',
         }
 
         if current_app.config['CLIENT_SENTRY_DSN']:

changes/models/jobplan.py

@@ -234,6 +234,7 @@ def get_build_step_for_job(cls, job_id):
                 cpus=bazel_cpus,
                 memory=bazel_memory,
                 max_executors=bazel_max_executors,
+                use_path_in_artifact_name=True,
             )
             return jobplan, implementation
 

tests/changes/buildsteps/test_default.py

@@ -563,6 +563,7 @@ def test_get_allocation_params(self):
             'artifact-search-path': 'source/tests',
             'use-external-env': 'false',
             'dist': 'ubuntu',
+            'use-path-in-artifact-name': 'false',
         }
 
     def test_get_allocation_params_with_artifact_search_path(self):
@@ -586,6 +587,7 @@ def test_get_allocation_params_with_artifact_search_path(self):
             'artifact-search-path': '/out',
             'use-external-env': 'false',
             'dist': 'ubuntu',
+            'use-path-in-artifact-name': 'false',
         }
 
     def test_get_allocation_params_with_artifact_search_path_from_jobstep(self):
@@ -611,6 +613,31 @@ def test_get_allocation_params_with_artifact_search_path_from_jobstep(self):
             'artifact-search-path': '/out',
             'use-external-env': 'false',
             'dist': 'ubuntu',
+            'use-path-in-artifact-name': 'false',
+        }
+
+    def test_get_allocation_params_use_path_in_artifact_name(self):
+        project = self.create_project()
+        build = self.create_build(project)
+        job = self.create_job(build)
+        jobphase = self.create_jobphase(job)
+        jobstep = self.create_jobstep(jobphase)
+
+        buildstep = self.get_buildstep(repo_path='source', path='tests', use_path_in_artifact_name=True)
+        result = buildstep.get_allocation_params(jobstep)
+        assert result == {
+            'adapter': 'basic',
+            'server': 'http://changes-int.example.com/api/0/',
+            'jobstep_id': jobstep.id.hex,
+            'release': 'precise',
+            's3-bucket': 'snapshot-bucket',
+            'pre-launch': 'echo pre',
+            'post-launch': 'echo post',
+            'artifacts-server': 'http://localhost:1234',
+            'artifact-search-path': 'source/tests',
+            'use-external-env': 'false',
+            'dist': 'ubuntu',
+            'use-path-in-artifact-name': 'true',
         }
 
     def test_get_allocation_params_for_snapshotting(self):

tests/changes/buildsteps/test_lxc.py

@@ -47,4 +47,5 @@ def test_get_allocation_params(self):
             'artifact-search-path': DEFAULT_PATH,
             'use-external-env': 'false',
             'dist': 'ubuntu',
+            'use-path-in-artifact-name': 'false',
         }

tests/changes/models/test_job.py

@@ -75,6 +75,8 @@ def test_autogenerated_commands(self, get_config):
 
         assert implementation.max_executors == 1
 
+        assert implementation.use_path_in_artifact_name is True
+
         assert implementation.commands[0].type == CommandType.setup
         assert implementation.commands[0].script == bazel_setup_expected
 
@@ -121,6 +123,8 @@ def test_autogenerated_commands_with_exclusions(self, get_config):
 
         assert implementation.max_executors == 3
 
+        assert implementation.use_path_in_artifact_name is True
+
         assert implementation.resources['cpus'] == 2
         assert implementation.resources['mem'] == 1234