| Index: scripts/slave/recipes/chromium.expected/full_bot_update_always_on_Package_Builder__Coverage_.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_ChromiumOS_daisy_Compile.json b/scripts/slave/recipes/chromium.expected/full_bot_update_always_on_Package_Builder__Coverage_.json
|
| similarity index 81%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_ChromiumOS_daisy_Compile.json
|
| copy to scripts/slave/recipes/chromium.expected/full_bot_update_always_on_Package_Builder__Coverage_.json
|
| index 441893fdf01b0a95b9b424738a81521a4aaef77b..528e025651fb27b7b87f68bbaeb878c176d6950d 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_chromiumos_ChromiumOS_daisy_Compile.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_bot_update_always_on_Package_Builder__Coverage_.json
|
| @@ -4,7 +4,7 @@
|
| "python",
|
| "-u",
|
| "\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",
|
| - "[BUILDER_CACHE]/ChromiumOS_daisy_Compile",
|
| + "[BUILDER_CACHE]/Package_Builder__Coverage_",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -40,7 +40,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/ChromiumOS_daisy_Compile",
|
| + "cwd": "[BUILDER_CACHE]/Package_Builder__Coverage_",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -180,25 +180,17 @@
|
| },
|
| {
|
| "cmd": [
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/cros",
|
| - "chrome-sdk",
|
| - "--board=daisy",
|
| - "--nocolor",
|
| - "--use-external-config",
|
| - "--clear-sdk-cache",
|
| - "--gomadir",
|
| - "[CACHE]/cipd/goma",
|
| - "--nostart-goma",
|
| - "--",
|
| "python",
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src",
|
| + "cwd": "[BUILDER_CACHE]/Package_Builder__Coverage_/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| + "GYP_DEFINES": "chromeos=1 component=shared_library ffmpeg_branding=ChromeOS gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 use_goma=1",
|
| + "IGNORE_DEPS_CHANGES": "1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -207,17 +199,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/Package_Builder__Coverage_/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| - "Release",
|
| - "--use-src-side-runtest-py",
|
| + "Debug",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/Package_Builder__Coverage_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"ChromiumOS daisy Compile\", \"buildnumber\": 571, \"mastername\": \"chromium.chromiumos\", \"slavename\": \"TestSlavename\", \"target_platform\": \"chromeos\"}"
|
| + "{\"buildername\": \"Package Builder (Coverage)\", \"buildnumber\": 571, \"mastername\": \"bot_update.always_on\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -230,12 +221,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src/testing/buildbot/chromium.chromiumos.json",
|
| + "[BUILDER_CACHE]/Package_Builder__Coverage_/src/testing/buildbot/bot_update.always_on.json",
|
| "/path/to/tmp/json"
|
| ],
|
| - "name": "read test spec (chromium.chromiumos.json)",
|
| + "name": "read test spec (bot_update.always_on.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/ChromiumOS_daisy_Compile/src/testing/buildbot/chromium.chromiumos.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/Package_Builder__Coverage_/src/testing/buildbot/bot_update.always_on.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -253,31 +244,21 @@
|
| },
|
| {
|
| "cmd": [
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/cros",
|
| - "chrome-sdk",
|
| - "--board=daisy",
|
| - "--nocolor",
|
| - "--use-external-config",
|
| - "--clear-sdk-cache",
|
| - "--gomadir",
|
| - "[CACHE]/cipd/goma",
|
| - "--nostart-goma",
|
| - "--",
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/Package_Builder__Coverage_/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "chromium.chromiumos",
|
| + "bot_update.always_on",
|
| "-b",
|
| - "ChromiumOS daisy Compile",
|
| + "Package Builder (Coverage)",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/Package_Builder__Coverage_/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "//out_daisy/Release"
|
| + "//out/Debug"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src",
|
| + "cwd": "[BUILDER_CACHE]/Package_Builder__Coverage_/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| @@ -285,15 +266,6 @@
|
| },
|
| {
|
| "cmd": [
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/cros",
|
| - "chrome-sdk",
|
| - "--board=daisy",
|
| - "--nocolor",
|
| - "--use-external-config",
|
| - "--gomadir",
|
| - "[CACHE]/cipd/goma",
|
| - "--nostart-goma",
|
| - "--",
|
| "python",
|
| "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| @@ -305,19 +277,19 @@
|
| "--ninja-path",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
|
| "--target",
|
| - "Release",
|
| + "Debug",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src",
|
| + "[BUILDER_CACHE]/Package_Builder__Coverage_/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "ChromiumOS daisy Compile",
|
| + "Package Builder (Coverage)",
|
| "--buildbot-mastername",
|
| - "chromium.chromiumos",
|
| + "bot_update.always_on",
|
| "--buildbot-slavename",
|
| "TestSlavename",
|
| "--goma-deps-cache-file",
|
| - "ChromiumOS_daisy_Compile.gomadeps",
|
| + "Package_Builder__Coverage_.gomadeps",
|
| "--build-data-dir",
|
| "[ROOT]/build_data_dir",
|
| "--compiler",
|
| @@ -329,14 +301,13 @@
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "--ninja-ensure-up-to-date",
|
| - "--cros-board",
|
| - "daisy",
|
| "--",
|
| - "chromiumos_preflight"
|
| + "All",
|
| + "chromium_builder_tests"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src",
|
| "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| + "IGNORE_DEPS_CHANGES": "1"
|
| },
|
| "name": "compile",
|
| "~followup_annotations": [
|
| @@ -354,23 +325,21 @@
|
| "python",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",
|
| "--target",
|
| - "Release",
|
| + "Debug",
|
| "--gsutil-py-path",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| "--staging-dir",
|
| "[CACHE]/chrome_staging",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/ChromiumOS_daisy_Compile/src",
|
| + "[BUILDER_CACHE]/Package_Builder__Coverage_/src",
|
| "--build-url",
|
| - "gs://chromium-chromiumos-archive/chromium.chromiumos/ChromiumOS daisy Compile",
|
| + "gs://!fake-coverage-bucket/bot_update.always_on/Package Builder (Coverage)",
|
| "--build_revision",
|
| "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--cros-board",
|
| - "daisy",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"ChromiumOS daisy Compile\", \"buildnumber\": 571, \"mastername\": \"chromium.chromiumos\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Package Builder (Coverage)\", \"buildnumber\": 571, \"mastername\": \"bot_update.always_on\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| "--build-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"ChromiumOS daisy Compile\", \"buildnumber\": 571, \"mastername\": \"chromium.chromiumos\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Package Builder (Coverage)\", \"buildnumber\": 571, \"mastername\": \"bot_update.always_on\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| ],
|
| "name": "package build"
|
| },
|
|
|