Enable SystemUIGoogleScreenshotTests on main and disable on udc-qpr-dev

At the moment the tests are only running on `udc-qpr-dev`, and not
on `main`.
If we disable them on `udc-qpr-dev` and keep them enabled on `main`,
they will still run in presubmits of both branches.

This way we also solve the problem of having potentially different
golden differences in both branches.

Change-Id: Ic7c389084838e57008d7eb327e674ef6407975af
Fixes: 292206289
Merged-In: I86236180877f14273f2b59fc3d4b37529ed87c49
This commit is contained in:
Chris Göllner
2023-07-21 11:01:30 +00:00
parent 80fafb7d7e
commit d2fd7a220d

View File

@@ -52,20 +52,6 @@
}
]
},
{
"name": "SystemUIGoogleScreenshotTests",
"options": [
{
"exclude-annotation": "org.junit.Ignore"
},
{
"exclude-annotation": "androidx.test.filters.FlakyTest"
},
{
"exclude-annotation": "android.platform.test.annotations.Postsubmit"
}
]
},
{
// TODO(b/251476085): Consider merging with SystemUIGoogleScreenshotTests (in U+)
"name": "SystemUIGoogleBiometricsScreenshotTests",
@@ -145,21 +131,5 @@
}
]
}
],
"postsubmit": [
{
"name": "SystemUIGoogleScreenshotTests",
"options": [
{
"exclude-annotation": "org.junit.Ignore"
},
{
"exclude-annotation": "android.platform.test.annotations.FlakyTest"
},
{
"include-annotation": "android.platform.test.annotations.Postsubmit"
}
]
}
]
}