| Index: scripts/slave/recipes/chromium.expected/full_chromium_lkgr_UBSan_Release.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_Mac.json b/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_UBSan_Release.json
|
| similarity index 82%
|
| copy from scripts/slave/recipes/chromium.expected/full_chromium_Mac.json
|
| copy to scripts/slave/recipes/chromium.expected/full_chromium_lkgr_UBSan_Release.json
|
| index 468e349d7856f0db6ad1fcc9ff08f629fd7f8222..b22cf422905a71ea68c8a4fd4c4a17663d2e14de 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_Mac.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_lkgr_UBSan_Release.json
|
| @@ -5,9 +5,9 @@
|
| "-u",
|
| "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
|
| "--master",
|
| - "chromium",
|
| + "chromium.lkgr",
|
| "--builder",
|
| - "Mac",
|
| + "UBSan Release",
|
| "--slave",
|
| "TestSlavename",
|
| "--spec",
|
| @@ -114,7 +114,7 @@
|
| "-u",
|
| "RECIPE_MODULE[build::cipd]/resources/bootstrap.py",
|
| "--platform",
|
| - "mac-amd64",
|
| + "linux-amd64",
|
| "--dest-directory",
|
| "[SLAVE_BUILD]/cipd",
|
| "--json-output",
|
| @@ -138,7 +138,7 @@
|
| "--root",
|
| "[CACHE]/cipd/goma",
|
| "--list",
|
| - "infra_internal/goma/client/mac-amd64 release",
|
| + "infra_internal/goma/client/linux-amd64 release",
|
| "--json-output",
|
| "/path/to/tmp/json",
|
| "--service-account-json",
|
| @@ -151,7 +151,7 @@
|
| "@@@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/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@}@@@",
|
| @@ -188,7 +188,7 @@
|
| "env": {
|
| "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' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1",
|
| + "GYP_DEFINES": "clang=1 component=static_library gomadir='[CACHE]/cipd/goma' release_extra_cflags=-fno-sanitize-recover=undefined sanitizer_coverage=edge target_arch=x64 ubsan=1 use_goma=1",
|
| "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
|
| },
|
| "name": "gclient runhooks"
|
| @@ -197,42 +197,6 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "[SLAVE_BUILD]/src/testing/scripts/get_compile_targets.py",
|
| - "--output",
|
| - "/path/to/tmp/json",
|
| - "--",
|
| - "--build-config-fs",
|
| - "Release",
|
| - "--paths",
|
| - "{\"checkout\": \"[SLAVE_BUILD]/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",
|
| - "--properties",
|
| - "{\"buildername\": \"Mac\", \"buildnumber\": 571, \"mastername\": \"chromium\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
|
| - ],
|
| - "name": "get compile targets for scripts",
|
| - "~followup_annotations": [
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| - "\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
|
| - "[SLAVE_BUILD]/src/testing/buildbot/chromium.json",
|
| - "/path/to/tmp/json"
|
| - ],
|
| - "name": "read test spec",
|
| - "~followup_annotations": [
|
| - "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.json@@@",
|
| - "@@@STEP_LOG_LINE@json.output@{}@@@",
|
| - "@@@STEP_LOG_END@json.output@@@"
|
| - ]
|
| - },
|
| - {
|
| - "cmd": [
|
| - "python",
|
| - "-u",
|
| "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| "--show-path",
|
| "python",
|
| @@ -247,9 +211,9 @@
|
| "[SLAVE_BUILD]/src/tools/mb/mb.py",
|
| "gen",
|
| "-m",
|
| - "chromium",
|
| + "chromium.lkgr",
|
| "-b",
|
| - "Mac",
|
| + "UBSan Release",
|
| "--config-file",
|
| "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
|
| "--goma-dir",
|
| @@ -313,9 +277,8 @@
|
| "/creds/service_accounts/service-account-goma-client.json",
|
| "--goma-dir",
|
| "[CACHE]/cipd/goma",
|
| - "--ninja-ensure-up-to-date",
|
| "--",
|
| - "all"
|
| + "chromium_builder_asan"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| @@ -330,17 +293,75 @@
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/chromium/archive_build.py",
|
| - "--target",
|
| - "Release",
|
| - "--factory-properties",
|
| - "{\"gclient_env\": {\"GYP_DEFINES\": \"clang=1 component=static_library gomadir='[CACHE]/cipd/goma' linux_dump_symbols=0 target_arch=x64 test_isolation_mode=noop use_goma=1\"}, \"gs_acl\": \"public-read\", \"gs_bucket\": \"gs://chromium-browser-snapshots\"}",
|
| - "--build-properties",
|
| - "{\"got_angle_revision\": \"fac9503c46405f77757b9a728eb85b8d7bc6080c\", \"got_angle_revision_cp\": \"refs/heads/master@{#297276}\", \"got_buildtools_revision\": \"f0319a328b2809876916353cb994259692140934\", \"got_buildtools_revision_cp\": \"refs/heads/master@{#182578}\", \"got_nacl_revision\": \"d998e125e8253980d76e269b7982aeeefc1b9b50\", \"got_nacl_revision_cp\": \"refs/heads/master@{#274981}\", \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", \"got_revision_cp\": \"refs/heads/master@{#170242}\", \"got_swarming_client_revision\": \"a0ee5d99f1d4b38ddaa4c759c837980b63b99566\", \"got_swarming_client_revision_cp\": \"refs/heads/master@{#276089}\", \"got_v8_revision\": \"801ada225ddc271c132c3a35f03975671d43e399\", \"got_v8_revision_cp\": \"refs/heads/master@{#43426}\", \"got_webrtc_revision\": \"0f90628433546e61d9268596da93418c623137f4\", \"got_webrtc_revision_cp\": \"refs/heads/master@{#120644}\"}",
|
| - "--mode",
|
| - "dev"
|
| + "\nimport json, os, sys\nif os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):\n with open(sys.argv[2], 'w') as f:\n json.dump(os.listdir(sys.argv[1]), f)\n",
|
| + "[SLAVE_BUILD]/src/out/Release",
|
| + "/path/to/tmp/json"
|
| ],
|
| - "name": "archive_build"
|
| + "name": "listdir build_dir",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@json.output@[@@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"file 1\", @@@",
|
| + "@@@STEP_LOG_LINE@json.output@ \"file 2\"@@@",
|
| + "@@@STEP_LOG_LINE@json.output@]@@@",
|
| + "@@@STEP_LOG_END@json.output@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import json, os, sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@if os.path.exists(sys.argv[1]) and os.path.isdir(sys.argv[1]):@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ with open(sys.argv[2], 'w') as f:@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@ json.dump(os.listdir(sys.argv[1]), f)@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_MODULE[build::archive]/resources/zip_archive.py",
|
| + "[TMP_BASE]/chrome_staging_tmp_1",
|
| + "ubsan-linux-release-170242",
|
| + "[\"file 1\", \"file 2\"]",
|
| + "[SLAVE_BUILD]/src/out/Release"
|
| + ],
|
| + "name": "zipping"
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
|
| + "--",
|
| + "-h",
|
| + "x-goog-meta-Cr-Commit-Position:refs/heads/master@{#170242}",
|
| + "-h",
|
| + "x-goog-meta-Cr-Commit-Position-Number:170242",
|
| + "-h",
|
| + "x-goog-meta-Cr-Git-Commit:f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| + "cp",
|
| + "-a",
|
| + "public-read",
|
| + "[TMP_BASE]/chrome_staging_tmp_1/ubsan-linux-release-170242.zip",
|
| + "gs://chromium-browser-ubsan/linux-release/ubsan-linux-release-170242.zip"
|
| + ],
|
| + "name": "gsutil upload",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-ubsan/linux-release/ubsan-linux-release-170242.zip@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
|
| + "[TMP_BASE]/chrome_staging_tmp_1/ubsan-linux-release-170242.zip"
|
| + ],
|
| + "name": "ubsan-linux-release-170242.zip",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LOG_LINE@python.inline@@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import os@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@import sys@@@",
|
| + "@@@STEP_LOG_LINE@python.inline@os.remove(sys.argv[1])@@@",
|
| + "@@@STEP_LOG_END@python.inline@@@"
|
| + ]
|
| },
|
| {
|
| "name": "$result",
|
|
|