diff options
| author | Julien Desprez <jdesprez@google.com> | 2024-04-18 09:52:34 -0700 |
|---|---|---|
| committer | Julien Desprez <jdesprez@google.com> | 2024-04-19 03:46:21 +0000 |
| commit | 5512e24a6958fb7c90162a33a69b37c2d58e70df (patch) | |
| tree | d7e59caeed124fb607a6374fdf3baa2be3e146ed | |
| parent | 871b72281a37ea14f9fe501e43d0d4ab381eda56 (diff) | |
| download | tradefederation-5512e24a6958fb7c90162a33a69b37c2d58e70df.tar.gz | |
Consider build key abort separately from device_image
This will help untangle the device image change vs.
build key changed or aborted.
Test: presubmit
Bug: 335511290
Change-Id: I3c59c67e37f0d807b4826831bcce43503c3c29d9
| -rw-r--r-- | src/com/android/tradefed/build/content/ImageContentAnalyzer.java | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/src/com/android/tradefed/build/content/ImageContentAnalyzer.java b/src/com/android/tradefed/build/content/ImageContentAnalyzer.java index 8d8a1e418..198af2c9b 100644 --- a/src/com/android/tradefed/build/content/ImageContentAnalyzer.java +++ b/src/com/android/tradefed/build/content/ImageContentAnalyzer.java @@ -62,10 +62,13 @@ public class ImageContentAnalyzer { || AnalysisMethod.DEVICE_IMAGE.equals( c.analysisMethod()))) .collect(Collectors.toList()); - // Handle invalidation should it be set. + // Handle invalidation should it be set for a device image. for (ContentAnalysisContext context : buildKeyAnalysis) { - if (context.abortAnalysis()) { - CLog.w("Analysis was aborted: %s", context.abortReason()); + if (AnalysisMethod.DEVICE_IMAGE.equals(context.analysisMethod()) + && context.abortAnalysis()) { + CLog.w( + "Analysis was aborted: %s for %s", + context.abortReason(), context.contentEntry()); InvocationMetricLogger.addInvocationMetrics( InvocationMetricKey.ABORT_CONTENT_ANALYSIS, 1); return null; @@ -102,6 +105,12 @@ public class ImageContentAnalyzer { /** Returns true if the analysis has differences */ private boolean buildKeyAnalysis(ContentAnalysisContext context) { + if (context.abortAnalysis()) { + CLog.w( + "Analysis was aborted for build key %s: %s", + context.contentEntry(), context.abortReason()); + return true; + } try { List<ArtifactFileDescriptor> diffs = TestContentAnalyzer.analyzeContentDiff( |