[infra] Remove the libimobiledevice dimension.
I strongly suspect we no longer need this, since it's been 9 months. More importantly, this number is just the modification time of the idevice_id binary on the RPi image (https://chrome-internal.googlesource.com/infradata/config/+/refs/heads/ main/configs/chromium-swarm/scripts/skia_mobile.py#1008), and that number changes on the rpi2-* image, so leaving this here would prevent any jobs from ever running on the machines we're moving to. Change-Id: Id5c627a387b6cdadf721ef9838a1674a140a5f27 Reviewed-on: https://skia-review.googlesource.com/c/skia/+/466766 Reviewed-by: Joe Gregorio <jcgregorio@google.com> Commit-Queue: Erik Rose <erikrose@google.com>
This commit is contained in:
parent
aa369d2b8e
commit
5c1672406a
@ -824,9 +824,6 @@ func (b *taskBuilder) defaultSwarmDimensions() {
|
||||
log.Fatalf("Entry %q not found in iOS mapping.", b.parts["model"])
|
||||
}
|
||||
d["device_type"] = device
|
||||
// Temporarily use this dimension to ensure we only use the new libimobiledevice, since the
|
||||
// old version won't work with current recipes.
|
||||
d["libimobiledevice"] = "1582155448"
|
||||
} else if b.cpu() || b.extraConfig("CanvasKit", "Docker", "SwiftShader") {
|
||||
modelMapping, ok := map[string]map[string]string{
|
||||
"AppleM1": {
|
||||
|
@ -32720,7 +32720,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPad6,3",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -32814,7 +32813,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPad6,3",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -32908,7 +32906,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone7,2",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-12.4.5",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -33002,7 +32999,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone7,2",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-12.4.5",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -33096,7 +33092,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone9,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -33190,7 +33185,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone9,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -33284,7 +33278,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone10,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -33378,7 +33371,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone10,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -33472,7 +33464,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone12,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -33566,7 +33557,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone12,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -61233,7 +61223,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPad6,3",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -61333,7 +61322,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPad6,3",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -61433,7 +61421,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPad6,3",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -61533,7 +61520,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPad6,3",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -61633,7 +61619,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone7,2",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-12.4.5",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -61733,7 +61718,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone7,2",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-12.4.5",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -61833,7 +61817,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone7,2",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-12.4.5",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -61933,7 +61916,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone7,2",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-12.4.5",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62033,7 +62015,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone9,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62133,7 +62114,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone9,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62233,7 +62213,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone9,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62333,7 +62312,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone9,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62433,7 +62411,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone10,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62533,7 +62510,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone10,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62633,7 +62609,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone10,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62733,7 +62708,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone10,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.3.1",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62833,7 +62807,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone12,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -62933,7 +62906,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone12,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -63033,7 +63005,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone12,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
@ -63133,7 +63104,6 @@
|
||||
],
|
||||
"dimensions": [
|
||||
"device_type:iPhone12,1",
|
||||
"libimobiledevice:1582155448",
|
||||
"os:iOS-13.6",
|
||||
"pool:Skia"
|
||||
],
|
||||
|
Loading…
Reference in New Issue
Block a user