| Index: scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug.json
|
| diff --git a/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug.json b/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug.json
|
| index efe267663e8300fbe11d0a026614ebd8c1dd615b..8a4e857388237171d1721d9bcd42d6362af51934 100644
|
| --- a/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug.json
|
| +++ b/scripts/slave/recipes/v8.expected/full_client_v8_ports_V8_Linux___x87___nosnap___debug.json
|
| @@ -3,187 +3,156 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| - "--master",
|
| - "client.v8.ports",
|
| - "--builder",
|
| - "V8 Linux - x87 - nosnap - debug",
|
| - "--slave",
|
| - "TestSlavename",
|
| - "--spec",
|
| - "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'chromium_trunk': 'svn://svn-mirror.golo.chromium.org/chrome/trunk'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'v8', 'url': 'https://chromium.googlesource.com/v8/v8'}]",
|
| - "--root",
|
| - "v8",
|
| - "--revision_mapping_file",
|
| - "{\"v8\": \"got_revision\"}",
|
| - "--git-cache-dir",
|
| - "[GIT_CACHE]",
|
| - "--output_json",
|
| - "/path/to/tmp/json",
|
| - "--revision",
|
| - "v8@54321",
|
| - "--no_shallow",
|
| - "--output_manifest"
|
| + "RECIPE_MODULE[depot_tools::git]/resources/git_setup.py",
|
| + "--path",
|
| + "[SLAVE_BUILD]/swarming.client",
|
| + "--url",
|
| + "https://chromium.googlesource.com/external/swarming.client.git"
|
| ],
|
| - "env": {
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "bot_update",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@Some step text@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"did_run\": true, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"fixed_revisions\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"v8\": \"54321\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"v8\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/v8.git\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f2cbea7e89a45f46819777bb78a1f5bd0241f64c\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"patch_failure\": false, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"patch_root\": \"v8\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f2cbea7e89a45f46819777bb78a1f5bd0241f64c\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#50110}\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"root\": \"v8\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"step_text\": \"Some step text\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision@\"f2cbea7e89a45f46819777bb78a1f5bd0241f64c\"@@@",
|
| - "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#50110}\"@@@"
|
| - ]
|
| + "name": "git setup (swarming_client)"
|
| },
|
| {
|
| - "cmd": [],
|
| - "name": "ensure_goma"
|
| + "cmd": [
|
| + "git",
|
| + "retry",
|
| + "fetch",
|
| + "origin",
|
| + "[dummy swarming client hash]"
|
| + ],
|
| + "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "name": "git fetch (swarming_client)"
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
|
| - "--platform",
|
| - "linux-386",
|
| - "--dest-directory",
|
| - "[SLAVE_BUILD]/cipd",
|
| - "--json-output",
|
| - "/path/to/tmp/json"
|
| + "git",
|
| + "checkout",
|
| + "-f",
|
| + "FETCH_HEAD"
|
| ],
|
| - "name": "ensure_goma.install cipd",
|
| - "~followup_annotations": [
|
| - "@@@STEP_NEST_LEVEL@1@@@",
|
| - "@@@STEP_TEXT@cipd instance_id: 40-chars-fake-of-the-package-instance_id@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"executable\": \"[SLAVE_BUILD]/cipd/cipd\", @@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"instance_id\": \"40-chars-fake-of-the-package-instance_id\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| + "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "name": "git checkout (swarming_client)"
|
| },
|
| {
|
| "cmd": [
|
| - "[SLAVE_BUILD]/cipd/cipd",
|
| - "ensure",
|
| - "--root",
|
| - "[CACHE]/cipd/goma",
|
| - "--list",
|
| - "infra_internal/goma/client/linux-386 release",
|
| - "--json-output",
|
| - "/path/to/tmp/json",
|
| - "--service-account-json",
|
| - "/creds/service_accounts/service-account-goma-client.json"
|
| + "git",
|
| + "rev-parse",
|
| + "HEAD"
|
| ],
|
| - "name": "ensure_goma.ensure_installed",
|
| + "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "name": "read revision",
|
| + "stdout": "/path/to/tmp/",
|
| "~followup_annotations": [
|
| - "@@@STEP_NEST_LEVEL@1@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ \"result\": [@@@",
|
| - "@@@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/linux-386\"@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| - "@@@STEP_LOG_LINE@json.output@ ]@@@",
|
| - "@@@STEP_LOG_LINE@json.output@}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| + "@@@STEP_TEXT@<br/>checked out 'deadbeef'<br/>@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| - "runhooks"
|
| + "git",
|
| + "clean",
|
| + "-f",
|
| + "-d",
|
| + "-x"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/v8",
|
| - "env": {
|
| - "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
|
| - "GYP_DEFINES": "gomadir='[CACHE]/cipd/goma' target_arch=ia32 use_goma=1 v8_enable_slow_dchecks=1 v8_optimized_debug=1 v8_target_arch=x87 v8_use_snapshot=false",
|
| - "GYP_GENERATORS": "ninja",
|
| - "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| - },
|
| - "name": "gclient runhooks"
|
| + "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "name": "git clean (swarming_client)"
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
|
| + "git",
|
| + "submodule",
|
| + "sync"
|
| ],
|
| - "name": "cleanup_temp"
|
| + "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "name": "submodule sync (swarming_client)"
|
| },
|
| {
|
| "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport os, sys\nfrom common import chromium_utils # Error? See https://crbug.com/584783.\n\n\nif os.path.exists(sys.argv[1]):\n chromium_utils.RemoveDirectory(sys.argv[1])\n",
|
| - "[SLAVE_BUILD]/v8/out/Debug"
|
| + "git",
|
| + "submodule",
|
| + "update",
|
| + "--init",
|
| + "--recursive"
|
| ],
|
| - "name": "rmtree build directory",
|
| + "cwd": "[SLAVE_BUILD]/swarming.client",
|
| + "name": "submodule update (swarming_client)",
|
| "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@import os, sys@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@from common import chromium_utils # Error? See https://crbug.com/584783.@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]):@@@",
|
| - "@@@STEP_LOG_LINE@python.inline@ chromium_utils.RemoveDirectory(sys.argv[1])@@@",
|
| - "@@@STEP_LOG_END@python.inline@@@"
|
| + "@@@SET_BUILD_PROPERTY@got_revision@\"20123\"@@@"
|
| ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| - "python",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/extract_build.py",
|
| - "--gsutil-py-path",
|
| - "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| - "--target",
|
| - "Debug",
|
| - "--src-dir",
|
| - "v8",
|
| - "--build-url",
|
| - "gs://chromium-v8/v8-linux-x87-nosnap-dbg",
|
| - "--master-name",
|
| - "client.v8.ports",
|
| - "--build-number",
|
| - "571"
|
| + "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "--version"
|
| ],
|
| - "name": "extract build"
|
| + "name": "swarming.py --version",
|
| + "stdout": "/path/to/tmp/",
|
| + "~followup_annotations": [
|
| + "@@@STEP_TEXT@0.4.10@@@"
|
| + ]
|
| },
|
| {
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/v8/tools/run-tests.py",
|
| + "[SLAVE_BUILD]/swarming.client/swarming.py",
|
| + "trigger",
|
| + "--swarming",
|
| + "https://chromium-swarm.appspot.com",
|
| + "--isolate-server",
|
| + "https://isolateserver.appspot.com",
|
| + "--priority",
|
| + "35",
|
| + "--shards",
|
| + "2",
|
| + "--task-name",
|
| + "Check/Ubuntu-14.04/[dummy has/V8 Linux - x87 - nosnap - debug/571",
|
| + "--dump-json",
|
| + "/path/to/tmp/json",
|
| + "--expiration",
|
| + "7200",
|
| + "--io-timeout",
|
| + "1200",
|
| + "--hard-timeout",
|
| + "7200",
|
| + "--dimension",
|
| + "cpu",
|
| + "x86-64",
|
| + "--dimension",
|
| + "gpu",
|
| + "none",
|
| + "--dimension",
|
| + "os",
|
| + "Ubuntu-14.04",
|
| + "--dimension",
|
| + "pool",
|
| + "Chrome",
|
| + "--tag",
|
| + "buildername:V8 Linux - x87 - nosnap - debug",
|
| + "--tag",
|
| + "buildnumber:571",
|
| + "--tag",
|
| + "data:[dummy hash for bot_default]",
|
| + "--tag",
|
| + "master:client.v8.ports",
|
| + "--tag",
|
| + "name:Check",
|
| + "--tag",
|
| + "os:Ubuntu-14.04",
|
| + "--tag",
|
| + "project:v8",
|
| + "--tag",
|
| + "purpose:CI",
|
| + "--tag",
|
| + "purpose:post-commit",
|
| + "--tag",
|
| + "slavename:TestSlavename",
|
| + "--tag",
|
| + "stepname:Check on Ubuntu-14.04",
|
| + "--idempotent",
|
| + "[dummy hash for bot_default]",
|
| + "--",
|
| "--progress=verbose",
|
| "--mode",
|
| "Debug",
|
| @@ -193,15 +162,59 @@
|
| "out",
|
| "--buildbot",
|
| "--timeout=200",
|
| - "--random-seed=-358114921",
|
| + "--random-seed=-976563914",
|
| "bot_default",
|
| "--no-snap",
|
| "--exhaustive-variants",
|
| "--rerun-failures-count=2",
|
| + "--swarming",
|
| "--json-test-results",
|
| - "/path/to/tmp/json"
|
| + "${ISOLATED_OUTDIR}/output.json"
|
| + ],
|
| + "name": "[trigger] Check on Ubuntu-14.04",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@{@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"base_task_name\": \"Check/Ubuntu-14.04/[dummy has/V8 Linux - x87 - nosnap - debug/571\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"tasks\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Check/Ubuntu-14.04/[dummy has/V8 Linux - x87 - nosnap - debug/571:2:0\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 0, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10000\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10000\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"Check/Ubuntu-14.04/[dummy has/V8 Linux - x87 - nosnap - debug/571:2:1\": {@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"shard_index\": 1, @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"task_id\": \"10100\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"view_url\": \"https://chromium-swarm.appspot.com/user/task/10100\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ }@@@",
|
| + "@@@STEP_LOG_LINE@json.output@}@@@",
|
| + "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@STEP_LINK@shard #0@https://chromium-swarm.appspot.com/user/task/10000@@@",
|
| + "@@@STEP_LINK@shard #1@https://chromium-swarm.appspot.com/user/task/10100@@@"
|
| + ]
|
| + },
|
| + {
|
| + "allow_subannotations": true,
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::v8]/resources/collect_v8_task.py",
|
| + "--swarming-client-dir",
|
| + "[SLAVE_BUILD]/swarming.client",
|
| + "--temp-root-dir",
|
| + "[TMP_BASE]",
|
| + "--merged-test-output",
|
| + "/path/to/tmp/json",
|
| + "--",
|
| + "collect",
|
| + "--swarming",
|
| + "https://chromium-swarm.appspot.com",
|
| + "--decorate",
|
| + "--print-status-updates",
|
| + "--shards",
|
| + "2",
|
| + "Check/Ubuntu-14.04/[dummy has/V8 Linux - x87 - nosnap - debug/571"
|
| ],
|
| - "cwd": "[SLAVE_BUILD]/v8",
|
| "name": "Check",
|
| "~followup_annotations": [
|
| "@@@STEP_LOG_LINE@durations@01:01:002 mjsunit/Cool.Test@@@",
|
|
|