Set IOS_BUNDLE_ID in recipes.

Instead of hard coding to com.google.dm, which will only work for Test
bots, set it in the environment when we know which bundle we're using.

CQ_INCLUDE_TRYBOTS=skia.primary:Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release,Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Debug

Change-Id: I43a0c832ff70e3b3c9bb987173784f4b6b992403
Reviewed-on: https://skia-review.googlesource.com/8076
Commit-Queue: Mike Klein <mtklein@chromium.org>
Reviewed-by: Mike Klein <mtklein@chromium.org>

diff --git a/infra/bots/recipe_modules/perf/api.py b/infra/bots/recipe_modules/perf/api.py
index 78b8378..b6544a1 100644 (file)
--- a/infra/bots/recipe_modules/perf/api.py
+++ b/infra/bots/recipe_modules/perf/api.py
@@ -230,6 +230,8 @@ def perf_steps(api):
 class PerfApi(recipe_api.RecipeApi):
   def run(self):
     self.m.core.setup()
+    if 'iOS' in self.m.vars.builder_name:
+      self.m.vars.default_env['IOS_BUNDLE_ID'] = 'com.google.nanobench'
     try:
       self.m.flavor.install_everything()
       perf_steps(self.m)

diff --git a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
index a14ba4c..99188c1 100644 (file)
--- a/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
+++ b/infra/bots/recipe_modules/perf/example.expected/Perf-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
@@ -8,6 +8,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_if_needed [START_DIR]/skia/resources"
@@ -40,6 +41,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "cat_file tmp/SKP_VERSION",
@@ -53,6 +55,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm tmp/SKP_VERSION"
@@ -65,6 +68,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm skps"
@@ -77,6 +81,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "mkdir skps"
@@ -90,6 +95,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_if_needed [START_DIR]/skp"
@@ -103,6 +109,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_file [START_DIR]/tmp/SKP_VERSION"
@@ -135,6 +142,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "cat_file tmp/SK_IMAGE_VERSION",
@@ -148,6 +156,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm tmp/SK_IMAGE_VERSION"
@@ -160,6 +169,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm images"
@@ -172,6 +182,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "mkdir images"
@@ -185,6 +196,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_if_needed [START_DIR]/skimage"
@@ -198,6 +210,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
@@ -230,6 +243,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "cat_file tmp/SVG_VERSION",
@@ -243,6 +257,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm tmp/SVG_VERSION"
@@ -255,6 +270,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm svgs"
@@ -267,6 +283,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "mkdir svgs"
@@ -280,6 +297,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_if_needed [START_DIR]/svg"
@@ -293,6 +311,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_file [START_DIR]/tmp/SVG_VERSION"
@@ -305,6 +324,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm perf"
@@ -317,6 +337,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "mkdir perf"
@@ -332,6 +353,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "package nanobench"
@@ -349,6 +371,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "nanobench"
@@ -384,6 +407,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.nanobench",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "pull_if_needed perf"

diff --git a/infra/bots/recipe_modules/sktest/api.py b/infra/bots/recipe_modules/sktest/api.py
index 8566db0..21093fa 100644 (file)
--- a/infra/bots/recipe_modules/sktest/api.py
+++ b/infra/bots/recipe_modules/sktest/api.py
@@ -551,6 +551,8 @@ def test_steps(api):
 class TestApi(recipe_api.RecipeApi):
   def run(self):
     self.m.core.setup()
+    if 'iOS' in self.m.vars.builder_name:
+      self.m.vars.default_env['IOS_BUNDLE_ID'] = 'com.google.dm'
     try:
       self.m.flavor.install_everything()
       test_steps(self.m)

diff --git a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
index a0d1404..070e936 100644 (file)
--- a/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
+++ b/infra/bots/recipe_modules/sktest/example.expected/Test-iOS-Clang-iPadMini4-GPU-GX6450-arm-Release.json
@@ -8,6 +8,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_if_needed [START_DIR]/skia/resources"
@@ -40,6 +41,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "cat_file tmp/SKP_VERSION",
@@ -53,6 +55,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm tmp/SKP_VERSION"
@@ -65,6 +68,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm skps"
@@ -77,6 +81,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "mkdir skps"
@@ -90,6 +95,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_if_needed [START_DIR]/skp"
@@ -103,6 +109,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_file [START_DIR]/tmp/SKP_VERSION"
@@ -135,6 +142,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "cat_file tmp/SK_IMAGE_VERSION",
@@ -148,6 +156,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm tmp/SK_IMAGE_VERSION"
@@ -160,6 +169,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm images"
@@ -172,6 +182,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "mkdir images"
@@ -185,6 +196,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_if_needed [START_DIR]/skimage"
@@ -198,6 +210,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION"
@@ -230,6 +243,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "cat_file tmp/SVG_VERSION",
@@ -243,6 +257,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm tmp/SVG_VERSION"
@@ -255,6 +270,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm svgs"
@@ -267,6 +283,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "mkdir svgs"
@@ -280,6 +297,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_if_needed [START_DIR]/svg"
@@ -293,6 +311,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_file [START_DIR]/tmp/SVG_VERSION"
@@ -349,6 +368,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "rm dm"
@@ -361,6 +381,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "mkdir dm"
@@ -398,6 +419,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "get uninteresting hashes",
@@ -444,6 +466,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt"
@@ -459,6 +482,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "package dm"
@@ -476,6 +500,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "dm"
@@ -489,6 +514,7 @@
     "env": {
       "BUILDTYPE": "Release",
       "CHROME_HEADLESS": "1",
+      "IOS_BUNDLE_ID": "com.google.dm",
       "SKIA_OUT": "[START_DIR]/out"
     },
     "name": "pull_if_needed dm"

diff --git a/platform_tools/ios/bin/ios_setup.sh b/platform_tools/ios/bin/ios_setup.sh
index 1acc03b..3768396 100755 (executable)
--- a/platform_tools/ios/bin/ios_setup.sh
+++ b/platform_tools/ios/bin/ios_setup.sh
@@ -27,8 +27,6 @@ PROVISIONING_PROFILE=""
 # Code Signing identity - this needs to be set up on the local machine.
 CODE_SIGN_IDENTITY="iPhone Developer"
 
-IOS_BUNDLE_ID="com.google.dm"
-
 IOS_RESULTS_DIR="results"
 
 # BUILDTYPE is 'Debug' by default.