In iOS recipe, uninstall before install.

Bug: skia:7408
Change-Id: Iea55fe9199db7fc841ed0ba4a2451a84cd57213f
Reviewed-on: https://skia-review.googlesource.com/90343
Reviewed-by: Stephan Altmueller <stephana@google.com>
Commit-Queue: Ben Wagner <benjaminwagner@google.com>

4 files changed, 109 insertions, 3 deletions

diff --git a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json
index f30c8c2da8..f8f5cdd604 100644
--- a/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json
+++ b/infra/bots/recipe_modules/flavor/examples/full.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Debug-All.json
@@ -135,6 +135,21 @@
   {
     "cmd": [
       "ideviceinstaller",
+      "-U",
+      "com.google.dm"
+    ],
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "uninstall_dm"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
       "-i",
       "[START_DIR]/out/Debug/dm.app"
     ],
@@ -150,6 +165,21 @@
   {
     "cmd": [
       "ideviceinstaller",
+      "-U",
+      "com.google.nanobench"
+    ],
+    "env": {
+      "BUILDTYPE": "Debug",
+      "CHROME_HEADLESS": "1",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "uninstall_nanobench"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
       "-i",
       "[START_DIR]/out/Debug/nanobench.app"
     ],
diff --git a/infra/bots/recipe_modules/flavor/ios_flavor.py b/infra/bots/recipe_modules/flavor/ios_flavor.py
index 4cb91a53ef..29f147c3c8 100644
--- a/infra/bots/recipe_modules/flavor/ios_flavor.py
+++ b/infra/bots/recipe_modules/flavor/ios_flavor.py
@@ -19,10 +19,18 @@ class iOSFlavorUtils(gn_flavor.GNFlavorUtils):
     for app_name in ['dm', 'nanobench']:
       app_package = self.m.vars.skia_out.join(self.m.vars.configuration,
                                               '%s.app' % app_name)
+
+      # If app ID changes, upgrade will fail, so uninstall first.
+      self.m.run(self.m.step,
+                 'uninstall_' + app_name,
+                 cmd=['ideviceinstaller', '-U', 'com.google.%s' % app_name],
+                 infra_step=True,
+                 # App may not be installed.
+                 abort_on_failure=False, fail_build_on_failure=False)
       self.m.run(self.m.step,
-                'install_' + app_name,
-                cmd=['ideviceinstaller', '-i', app_package],
-                infra_step=True)
+                 'install_' + app_name,
+                 cmd=['ideviceinstaller', '-i', app_package],
+                 infra_step=True)
 
     self.device_dirs = default_flavor.DeviceDirs(
         dm_dir='dm',
diff --git a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
index bbd6699542..5598557e49 100644
--- a/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
+++ b/infra/bots/recipes/perf.expected/Perf-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
@@ -17,6 +17,23 @@
   {
     "cmd": [
       "ideviceinstaller",
+      "-U",
+      "com.google.dm"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "uninstall_dm"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
       "-i",
       "[START_DIR]/out/Release/dm.app"
     ],
@@ -34,6 +51,23 @@
   {
     "cmd": [
       "ideviceinstaller",
+      "-U",
+      "com.google.nanobench"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "uninstall_nanobench"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
       "-i",
       "[START_DIR]/out/Release/nanobench.app"
     ],
diff --git a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
index 9d0dde5547..1a97c9f7a1 100644
--- a/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
+++ b/infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json
@@ -17,6 +17,23 @@
   {
     "cmd": [
       "ideviceinstaller",
+      "-U",
+      "com.google.dm"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "uninstall_dm"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
       "-i",
       "[START_DIR]/out/Release/dm.app"
     ],
@@ -34,6 +51,23 @@
   {
     "cmd": [
       "ideviceinstaller",
+      "-U",
+      "com.google.nanobench"
+    ],
+    "env": {
+      "BUILDTYPE": "Release",
+      "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
+      "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice",
+      "PATH": "<PATH>:RECIPE_PACKAGE_REPO[depot_tools]",
+      "SKIA_OUT": "[START_DIR]/out"
+    },
+    "infra_step": true,
+    "name": "uninstall_nanobench"
+  },
+  {
+    "cmd": [
+      "ideviceinstaller",
       "-i",
       "[START_DIR]/out/Release/nanobench.app"
     ],