| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_Ozone_Linux.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Print_Preview_Linux.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Ozone_Linux.json
|
| similarity index 82%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_Print_Preview_Linux.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_fyi_Ozone_Linux.json
|
| index bed9b06b16a0af754bf1dd26604631f5b784e202..bc5f823cb83718a692aa0015d67f5ea6964ae033 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Print_Preview_Linux.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Ozone_Linux.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]/Print_Preview_Linux",
|
| + "[BUILDER_CACHE]/linux",
|
| "511"
|
| ],
|
| "name": "makedirs checkout path",
|
| @@ -40,7 +40,7 @@
|
| "src@HEAD",
|
| "--output_manifest"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Print_Preview_Linux",
|
| + "cwd": "[BUILDER_CACHE]/linux",
|
| "env": {
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| @@ -182,13 +182,27 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILDER_CACHE]/linux/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]/Print_Preview_Linux/src",
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_DEFINES": "component=shared_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
|
| + "GYP_CHROMIUM_NO_ACTION": "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"
|
| @@ -197,16 +211,16 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[BUILDER_CACHE]/Print_Preview_Linux/src/testing/scripts/get_compile_targets.py",
|
| + "[BUILDER_CACHE]/linux/src/testing/scripts/get_compile_targets.py",
|
| "--output",
|
| "/path/to/tmp/json",
|
| "--",
|
| "--build-config-fs",
|
| "Release",
|
| "--paths",
|
| - "{\"checkout\": \"[BUILDER_CACHE]/Print_Preview_Linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| + "{\"checkout\": \"[BUILDER_CACHE]/linux/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| "--properties",
|
| - "{\"buildername\": \"Print Preview Linux\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| + "{\"buildername\": \"Ozone Linux\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"linux\"}"
|
| ],
|
| "name": "get compile targets for scripts",
|
| "~followup_annotations": [
|
| @@ -219,12 +233,12 @@
|
| "python",
|
| "-u",
|
| "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[BUILDER_CACHE]/Print_Preview_Linux/src/testing/buildbot/chromium.fyi.json",
|
| + "[BUILDER_CACHE]/linux/src/testing/buildbot/chromium.fyi.json",
|
| "/path/to/tmp/json"
|
| ],
|
| "name": "read test spec (chromium.fyi.json)",
|
| "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [BUILDER_CACHE]/Print_Preview_Linux/src/testing/buildbot/chromium.fyi.json@@@",
|
| + "@@@STEP_TEXT@path: [BUILDER_CACHE]/linux/src/testing/buildbot/chromium.fyi.json@@@",
|
| "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| "@@@STEP_LOG_END@json.output@@@"
|
| ]
|
| @@ -244,6 +258,28 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb.py",
|
| + "gen",
|
| + "-m",
|
| + "chromium.fyi",
|
| + "-b",
|
| + "Ozone Linux",
|
| + "--config-file",
|
| + "[BUILDER_CACHE]/linux/src/tools/mb/mb_config.pyl",
|
| + "--goma-dir",
|
| + "[CACHE]/cipd/goma",
|
| + "//out/Release"
|
| + ],
|
| + "cwd": "[BUILDER_CACHE]/linux/src",
|
| + "env": {
|
| + "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| + },
|
| + "name": "generate_build_files"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| "--show-path",
|
| "python",
|
| @@ -255,17 +291,17 @@
|
| "--target",
|
| "Release",
|
| "--src-dir",
|
| - "[BUILDER_CACHE]/Print_Preview_Linux/src",
|
| + "[BUILDER_CACHE]/linux/src",
|
| "--goma-cache-dir",
|
| "[GOMA_CACHE]",
|
| "--buildbot-buildername",
|
| - "Print Preview Linux",
|
| + "Ozone Linux",
|
| "--buildbot-mastername",
|
| "chromium.fyi",
|
| "--buildbot-slavename",
|
| "TestSlavename",
|
| "--goma-deps-cache-file",
|
| - "Print_Preview_Linux.gomadeps",
|
| + "Ozone_Linux.gomadeps",
|
| "--build-data-dir",
|
| "[ROOT]/build_data_dir",
|
| "--compiler",
|
| @@ -277,8 +313,8 @@
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| "--",
|
| - "blink_tests",
|
| - "browser_tests"
|
| + "All",
|
| + "chromium_builder_tests"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| @@ -290,34 +326,32 @@
|
| ]
|
| },
|
| {
|
| + "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| + "--show-path",
|
| + "python",
|
| + "RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",
|
| "--target",
|
| "Release",
|
| - "--xvfb",
|
| + "--gsutil-py-path",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| + "--staging-dir",
|
| + "[CACHE]/chrome_staging",
|
| + "--src-dir",
|
| + "[BUILDER_CACHE]/linux/src",
|
| + "--build-url",
|
| + "gs://chromium-fyi-archive/chromium.fyi/Ozone Linux",
|
| + "--build_revision",
|
| + "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Print Preview Linux\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"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\": \"Ozone Linux\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"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\": \"Print Preview Linux\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
|
| - "--step-name=print_preview_tests",
|
| - "--builder-name=Print Preview Linux",
|
| - "--slave-name=TestSlavename",
|
| - "--build-number=571",
|
| - "--run-python-script",
|
| - "[BUILDER_CACHE]/Print_Preview_Linux/src/third_party/WebKit/Tools/Scripts/run-webkit-tests",
|
| - "--write-full-results-to",
|
| - "/path/to/tmp/json",
|
| - "--platform",
|
| - "browser_test.linux"
|
| + "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Ozone Linux\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| ],
|
| - "cwd": "[BUILDER_CACHE]/Print_Preview_Linux",
|
| - "env": {
|
| - "CHROME_DEVEL_SANDBOX": "/opt/chromium/chrome_sandbox",
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| - },
|
| - "name": "print_preview_tests"
|
| + "name": "package build"
|
| },
|
| {
|
| "name": "$result",
|
|
|