toolchain: use new names for some ArtifactTypes.
Use the new names for the toolchain artifacts, so that we can drop the
deprecated ones.
BUG=chromium:1019868
TEST=train
Change-Id: I4db4e08f563f72684d80846c063d9aca7b68afa3
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/2087104
Tested-by: LaMont Jones <lamontjones@chromium.org>
Reviewed-by: David Burger <dburger@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Commit-Queue: LaMont Jones <lamontjones@chromium.org>
diff --git a/api/controller/toolchain.py b/api/controller/toolchain.py
index d69ba7f..ff144af 100644
--- a/api/controller/toolchain.py
+++ b/api/controller/toolchain.py
@@ -26,11 +26,11 @@
# TODO(crbug/1019868): Add handlers as needed.
_Handlers = collections.namedtuple('_Handlers', ['name', 'prepare', 'bundle'])
_TOOLCHAIN_ARTIFACT_HANDLERS = {
- BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE:
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE:
_Handlers('UnverifiedOrderingFile',
toolchain_util.PrepareForBuild,
toolchain_util.BundleArtifacts),
- BuilderConfig.Artifacts.VERIFIED_ORDERING_FILE:
+ BuilderConfig.Artifacts.VERIFIED_CHROME_LLVM_ORDERFILE:
_Handlers('VerifiedOrderingFile',
toolchain_util.PrepareForBuild,
toolchain_util.BundleArtifacts),
diff --git a/api/controller/toolchain_unittest.py b/api/controller/toolchain_unittest.py
index 60f091d..5e7d9dc 100644
--- a/api/controller/toolchain_unittest.py
+++ b/api/controller/toolchain_unittest.py
@@ -192,7 +192,7 @@
self.bundle = self.PatchObject(
toolchain_util, 'BundleArtifacts', return_value=[])
self.PatchObject(toolchain, '_TOOLCHAIN_ARTIFACT_HANDLERS', {
- BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE:
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE:
toolchain._Handlers('UnverifiedOrderingFile',
self.prep, self.bundle),
})
@@ -214,7 +214,8 @@
def testAcceptsNone(self):
request = toolchain_pb2.PrepareForToolchainBuildRequest(
- artifact_types=[BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE],
+ artifact_types=[
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE],
chroot=None, sysroot=None)
toolchain.PrepareForBuild(request, self.response, self.api_config)
self.prep.assert_called_once_with(
@@ -222,7 +223,8 @@
def testHandlesUnknownInputArtifacts(self):
request = toolchain_pb2.PrepareForToolchainBuildRequest(
- artifact_types=[BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE],
+ artifact_types=[
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE],
chroot=None, sysroot=None, input_artifacts=[
BuilderConfig.Artifacts.InputArtifactInfo(
input_artifact_type=BuilderConfig.Artifacts.IMAGE_ZIP,
@@ -234,15 +236,16 @@
def testPassesAdditionalArgs(self):
request = toolchain_pb2.PrepareForToolchainBuildRequest(
- artifact_types=[BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE],
+ artifact_types=[
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE],
chroot=None, sysroot=None, input_artifacts=[
BuilderConfig.Artifacts.InputArtifactInfo(
input_artifact_type=\
- BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE,
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE,
input_artifact_gs_locations=['path1', 'path2']),
BuilderConfig.Artifacts.InputArtifactInfo(
input_artifact_type=\
- BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE,
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE,
input_artifact_gs_locations=['path3']),
],
additional_args=common_pb2.PrepareForBuildAdditionalArgs(
@@ -257,15 +260,16 @@
def testHandlesDuplicateInputArtifacts(self):
request = toolchain_pb2.PrepareForToolchainBuildRequest(
- artifact_types=[BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE],
+ artifact_types=[
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE],
chroot=None, sysroot=None, input_artifacts=[
BuilderConfig.Artifacts.InputArtifactInfo(
input_artifact_type=\
- BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE,
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE,
input_artifact_gs_locations=['path1', 'path2']),
BuilderConfig.Artifacts.InputArtifactInfo(
input_artifact_type=\
- BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE,
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE,
input_artifact_gs_locations=['path3']),
])
toolchain.PrepareForBuild(request, self.response, self.api_config)
@@ -287,7 +291,7 @@
self.bundle = self.PatchObject(
toolchain_util, 'BundleArtifacts', return_value=[])
self.PatchObject(toolchain, '_TOOLCHAIN_ARTIFACT_HANDLERS', {
- BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE:
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE:
toolchain._Handlers('UnverifiedOrderingFile',
self.prep, self.bundle),
})
@@ -311,20 +315,21 @@
def testValidateOnly(self):
"""Sanity check that a validate only call does not execute any logic."""
request = self._GetRequest(
- [BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE])
+ [BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE])
toolchain.BundleArtifacts(request, self.response,
self.validate_only_config)
self.bundle.assert_not_called()
def testSetsArtifactsInfo(self):
request = self._GetRequest(
- [BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE])
+ [BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE])
self.bundle.return_value = ['artifact.xz']
toolchain.BundleArtifacts(request, self.response, self.api_config)
self.assertEqual(1, len(self.response.artifacts_info))
self.assertEqual(
self.response.artifacts_info[0],
toolchain_pb2.ArtifactInfo(
- artifact_type=BuilderConfig.Artifacts.UNVERIFIED_ORDERING_FILE,
+ artifact_type=(
+ BuilderConfig.Artifacts.UNVERIFIED_CHROME_LLVM_ORDERFILE),
artifacts=[
artifacts_pb2.Artifact(path=self.bundle.return_value[0])]))