From 0f690105496fa7f1de4bee85f4bf035cdefa84a8 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Tue, 15 May 2018 15:04:58 -0400 Subject: [recipes] BUILDTYPE and SKIA_OUT are no longer used Bug: skia:6473 Change-Id: I67b0dbf6dba26233df1d8e44f3e2f69ca0cc9d3e Reviewed-on: https://skia-review.googlesource.com/128320 Commit-Queue: Eric Boren Reviewed-by: Stephan Altmueller Reviewed-by: Ben Wagner --- ...Clang-iPadPro-GPU-GT7800-arm64-Release-All.json | 112 ++++++--------------- 1 file changed, 28 insertions(+), 84 deletions(-) (limited to 'infra/bots/recipes/test.expected/Test-iOS-Clang-iPadPro-GPU-GT7800-arm64-Release-All.json') 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 c2b89431d2..ec28b61cd1 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 @@ -19,12 +19,10 @@ "ios.py" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "setup_device" @@ -36,12 +34,10 @@ "[START_DIR]/build/out/Release/dm.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_dm" @@ -53,12 +49,10 @@ "[START_DIR]/build/out/Release/nanobench.app" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "install_nanobench" @@ -70,12 +64,10 @@ "resources" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skia/resources" @@ -122,12 +114,10 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SKP_VERSION", @@ -139,12 +129,10 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SKP_VERSION" @@ -155,12 +143,10 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm skps" @@ -171,12 +157,10 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir skps" @@ -188,12 +172,10 @@ "skps" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skp" @@ -205,12 +187,10 @@ "tmp/SKP_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SKP_VERSION" @@ -257,12 +237,10 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SK_IMAGE_VERSION", @@ -274,12 +252,10 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SK_IMAGE_VERSION" @@ -290,12 +266,10 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm images" @@ -306,12 +280,10 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir images" @@ -323,12 +295,10 @@ "images" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/skimage" @@ -340,12 +310,10 @@ "tmp/SK_IMAGE_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SK_IMAGE_VERSION" @@ -392,12 +360,10 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "cat_file tmp/SVG_VERSION", @@ -409,12 +375,10 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm tmp/SVG_VERSION" @@ -425,12 +389,10 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm svgs" @@ -441,12 +403,10 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir svgs" @@ -458,12 +418,10 @@ "svgs" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_if_needed [START_DIR]/svg" @@ -475,12 +433,10 @@ "tmp/SVG_VERSION" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/SVG_VERSION" @@ -527,12 +483,10 @@ "dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "rm dm" @@ -543,12 +497,10 @@ "dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "mkdir dm" @@ -561,12 +513,10 @@ "[START_DIR]/tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "get uninteresting hashes", @@ -611,12 +561,10 @@ "tmp/uninteresting_hashes.txt" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "push_file [START_DIR]/tmp/uninteresting_hashes.txt" @@ -941,12 +889,10 @@ "--verbose" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "name": "dm" }, @@ -957,12 +903,10 @@ "[START_DIR]/[SWARM_OUT_DIR]/dm" ], "env": { - "BUILDTYPE": "Release", "CHROME_HEADLESS": "1", "IOS_BUNDLE_ID": "com.google.dm", "IOS_MOUNT_POINT": "[START_DIR]/mnt_iosdevice", - "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]", - "SKIA_OUT": "[START_DIR]/build/out" + "PATH": ":RECIPE_PACKAGE_REPO[depot_tools]" }, "infra_step": true, "name": "pull_if_needed dm" -- cgit v1.2.3