Allow content analysis to be ignored am: 63824798d7 am: ec8ccdd2b2

Original change: https://android-review.googlesource.com/c/platform/tools/tradefederation/+/2869294

Change-Id: I89baa4652cac4fc1615fcdf218d5510dc8de3a3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 18 insertions, 1 deletions

diff --git a/src/com/android/tradefed/result/skipped/SkipManager.java b/src/com/android/tradefed/result/skipped/SkipManager.java
index 8d6880786..c5d5f4229 100644
--- a/src/com/android/tradefed/result/skipped/SkipManager.java
+++ b/src/com/android/tradefed/result/skipped/SkipManager.java
@@ -68,6 +68,16 @@ public class SkipManager implements IDisableable {
             description = "Enable the layer of skipping when there is no discovered tests to run.")
     private boolean mSkipOnNoTestsDiscovered = false;
 
+    @Option(
+            name = "skip-on-no-change-presubmit-only",
+            description = "Allow enabling the skip logic only in presubmit.")
+    private boolean mSkipOnNoChangePresubmitOnly = false;
+
+    @Option(
+            name = "considered-for-content-analysis",
+            description = "Some tests do not directly rely on content for being relevant.")
+    private boolean mConsideredForContent = true;
+
     // Contains the filter and reason for demotion
     private final Map<String, SkipReason> mDemotionFilters = new LinkedHashMap<>();
 
@@ -202,7 +212,11 @@ public class SkipManager implements IDisableable {
         if (results.deviceImageChanged()) {
             return false;
         }
-        if (!"WORK_NODE".equals(information.getContext().getAttribute("trigger"))) {
+        if (!mConsideredForContent) {
+            return false;
+        }
+        boolean presubmit = "WORK_NODE".equals(information.getContext().getAttribute("trigger"));
+        if (!presubmit) {
             // Eventually support postsubmit analysis.
             InvocationMetricLogger.addInvocationMetrics(
                     InvocationMetricKey.NO_CHANGES_POSTSUBMIT, 1);
@@ -213,6 +227,9 @@ public class SkipManager implements IDisableable {
         if (mSkipOnNoChange) {
             return true;
         }
+        if (presubmit && mSkipOnNoChangePresubmitOnly) {
+            return true;
+        }
         InvocationMetricLogger.addInvocationMetrics(
                 InvocationMetricKey.SILENT_INVOCATION_SKIP_COUNT, 1);
         return false;