| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Linux_Engine.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Linux_Engine.json
|
| similarity index 87%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Linux_Engine.json
|
| index 9a9b721546b0f4e0af56ecf2389b2c3aede6061a..7afec2ec6b92413b6828daff9ca350b4687e8bb5 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_11.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Blimp_Linux_Engine.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]/Chromium_Mac_10_11",
|
| + "[BUILDER_CACHE]/Blimp_Linux_Engine",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -40,8 +40,9 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Chromium_Mac_10_11",
|
| + "cwd": "[BUILDER_CACHE]/Blimp_Linux_Engine",
|
| "env": {
|
| + "GCLIENT_KILL_GIT_FETCH_AFTER": "1200",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "bot_update",
|
| @@ -130,7 +131,7 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
|
| "--platform",
|
| - "mac-amd64",
|
| + "linux-amd64",
|
| "--dest-directory",
|
| "[SLAVE_BUILD]/cipd",
|
| "--json-output",
|
| @@ -154,7 +155,7 @@
|
| "--root",
|
| "[CACHE]/cipd/goma",
|
| "--list",
|
| - "infra/tools/cloudtail/mac-amd64 goma_recipe_module\ninfra_internal/goma/client/mac-amd64 release",
|
| + "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--service-account-json",
|
| @@ -167,11 +168,11 @@
|
| "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
|
| "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-goma_recipe_modu\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/mac-amd64\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"resolved-instance_id-of-release---------\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/mac-amd64\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra_internal/goma/client/linux-amd64\"@@@",
|
| "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| "@@@STEP_LOG_LINE@json.output@}@@@",
|
| @@ -182,15 +183,27 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILDER_CACHE]/Blimp_Linux_Engine/src/tools/swarming_client/swarming.py",
|
| + "--version"
|
| + ],
|
| + "name": "swarming.py --version",
|
| + "stdout": "/path/to/tmp/",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@0.8.6@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Chromium_Mac_10_11/src",
|
| + "cwd": "[BUILDER_CACHE]/Blimp_Linux_Engine/src",
|
| "env": {
|
| - "FORCE_MAC_TOOLCHAIN": "1",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| "GYP_CHROMIUM_NO_ACTION": "1",
|
| - "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
|
| + "GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 test_isolation_mode=prepare use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -199,16 +212,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Chromium_Mac_10_11/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/Blimp_Linux_Engine/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Chromium_Mac_10_11/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/Blimp_Linux_Engine/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Chromium Mac 10.11\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
|
| + "{\"buildername\": \"Blimp Linux Engine\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -221,13 +234,24 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Chromium_Mac_10_11/src/testing/buildbot/chromium.fyi.json",
|
| + "[BUILDER_CACHE]/Blimp_Linux_Engine/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/Chromium_Mac_10_11/src/testing/buildbot/chromium.fyi.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/Blimp_Linux_Engine/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Blimp Linux Engine\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"gtest_tests\": [@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"swarming\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"can_use_on_swarming_builders\": true@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"test\": \"browser_tests\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| },
|
| @@ -246,49 +270,25 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Chromium_Mac_10_11/src/tools/mb/mb.py",
|
| + "[BUILDER_CACHE]/Blimp_Linux_Engine/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| "chromium.fyi",
|
| "-b",
|
| - "Chromium Mac 10.11",
|
| + "Blimp Linux Engine",
|
| "--config-file",
|
| - "[BUILDER_CACHE]/Chromium_Mac_10_11/src/tools/mb/mb_config.pyl",
|
| + "[BUILDER_CACHE]/Blimp_Linux_Engine/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "//out/Release"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Chromium_Mac_10_11/src",
|
| + "cwd": "[BUILDER_CACHE]/Blimp_Linux_Engine/src",
|
| "env": {
|
| - "FORCE_MAC_TOOLCHAIN": "1",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| "name": "generate_build_files"
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/clang_revision.py",
|
| - "--src-dir",
|
| - "[BUILDER_CACHE]/Chromium_Mac_10_11/src",
|
| - "--output-json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "env": {
|
| - "FORCE_MAC_TOOLCHAIN": "1",
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| - },
|
| - "name": "clang_revision",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"clang_revision\": \"123456-7\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| @@ -303,11 +303,11 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Chromium_Mac_10_11/src",
|
| + "[BUILDER_CACHE]/Blimp_Linux_Engine/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "Chromium Mac 10.11",
|
| + "Blimp Linux Engine",
|
| "--buildbot-mastername",
|
| "chromium.fyi",
|
| "--buildbot-slavename",
|
| @@ -317,7 +317,7 @@
|
| "--build-data-dir",
|
| "[ROOT]/build_data_dir",
|
| "--compiler",
|
| - "goma-clang",
|
| + "goma",
|
| "--goma-jsonstatus",
|
| "/path/to/tmp/json",
|
| "--goma-service-account-json-file",
|
| @@ -329,7 +329,6 @@
|
| "chromium_builder_tests"
|
| ],
|
| "env": {
|
| - "FORCE_MAC_TOOLCHAIN": "1",
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| },
|
| "name": "compile",
|
|
|