commit e782167146b698d9b478cab7409101b7c1dfccce
author LaMont Jones <lamontjones@chromium.org> Thu Apr 09 08:56:26 2020 -0600
committer Commit Bot <commit-bot@chromium.org> Tue Apr 21 04:34:15 2020 +0000
tree d152be455b96065474ac61cd624672b7b51aed95
parent 66b51ce12cdbe8b54a24cbe9b34c088ddb606f0c

toolchain: additional_args => profile_info

Switch to using profile_info.

BUG=chromium:1019868
TEST=unittests

Change-Id: I0506ede754b416f98441e1e0c7e33e0e4a37bb38
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2155792
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
Tested-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>

api/controller/toolchain_unittest.py

diff --git a/api/controller/toolchain_unittest.py b/api/controller/toolchain_unittest.py
index b5bb02f..07691b9 100644
--- a/api/controller/toolchain_unittest.py
+++ b/api/controller/toolchain_unittest.py
@@ -234,7 +234,7 @@
     self.prep.assert_called_once_with(
         'UnverifiedChromeLlvmOrderfile', None, '', '', {}, {})
 
-  def testPassesAdditionalArgs(self):
+  def testPassesProfileInfo(self):
     request = toolchain_pb2.PrepareForToolchainBuildRequest(
         artifact_types=[
             BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE],
@@ -248,7 +248,7 @@
                     BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE,
                 input_artifact_gs_locations=['path3']),
         ],
-        additional_args=common_pb2.PrepareForBuildAdditionalArgs(
+        profile_info=common_pb2.ArtifactProfileInfo(
             chrome_cwp_profile='CWPVERSION'),
     )
     toolchain.PrepareForBuild(request, self.response, self.api_config)
@@ -259,6 +259,33 @@
         },
         {'chrome_cwp_profile': 'CWPVERSION'})
 
+  def testPassesProfileInfoAfdoRelease(self):
+    request = toolchain_pb2.PrepareForToolchainBuildRequest(
+        artifact_types=[
+            BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE],
+        chroot=None, sysroot=None, input_artifacts=[
+            BuilderConfig.Artifacts.InputArtifactInfo(
+                input_artifact_type=\
+                    BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE,
+                input_artifact_gs_locations=['path1', 'path2']),
+            BuilderConfig.Artifacts.InputArtifactInfo(
+                input_artifact_type=\
+                    BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE,
+                input_artifact_gs_locations=['path3']),
+        ],
+        profile_info=common_pb2.ArtifactProfileInfo(
+            afdo_release=common_pb2.AfdoRelease(
+                chrome_cwp_profile='CWPVERSION',
+                image_build_id=1234)),
+    )
+    toolchain.PrepareForBuild(request, self.response, self.api_config)
+    self.prep.assert_called_once_with(
+        'UnverifiedChromeLlvmOrderfile', None, '', '', {
+            'UnverifiedChromeLlvmOrderfile': [
+                'gs://path1', 'gs://path2', 'gs://path3'],
+        },
+        {'chrome_cwp_profile': 'CWPVERSION', 'image_build_id': 1234})
+
   def testHandlesDuplicateInputArtifacts(self):
     request = toolchain_pb2.PrepareForToolchainBuildRequest(
         artifact_types=[