| Index: scripts/slave/recipes/chromium.expected/full_chromium_fyi_CFI_Linux_CF.json
|
| diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CFI_Linux_CF.json b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CFI_Linux_CF.json
|
| index c37a4c6773ca071798cc5e15a5e6348b42805cfe..5d6124fcb42def72b815bafdbcff42d27d5663ab 100644
|
| --- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CFI_Linux_CF.json
|
| +++ b/scripts/slave/recipes/chromium.expected/full_chromium_fyi_CFI_Linux_CF.json
|
| @@ -108,6 +108,25 @@
|
| "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]/src/out/Release"
|
| + ],
|
| + "name": "rmtree clobber",
|
| + "~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@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
|
| "runhooks"
|
| ],
|
| @@ -242,7 +261,7 @@
|
| "--compiler",
|
| "clang",
|
| "--",
|
| - "All"
|
| + "chromium_builder_asan"
|
| ],
|
| "env": {
|
| "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
|
| @@ -250,26 +269,78 @@
|
| "name": "compile"
|
| },
|
| {
|
| - "allow_subannotations": true,
|
| "cmd": [
|
| "python",
|
| "-u",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
|
| - "--show-path",
|
| + "\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": "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",
|
| - "RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",
|
| - "--target",
|
| - "Release",
|
| - "--build-url",
|
| - "gs://chromium-fyi-archive/chromium.fyi/CFI Linux CF",
|
| - "--build_revision",
|
| - "f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",
|
| - "--factory-properties",
|
| - "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"CFI Linux CF\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"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\": \"CFI Linux CF\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}"
|
| + "-u",
|
| + "RECIPE_MODULE[build::archive]/resources/zip_archive.py",
|
| + "[TMP_BASE]/chrome_staging_tmp_1",
|
| + "cfi-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/cfi-linux-release-170242.zip",
|
| + "gs://chromium-browser-cfi/linux-release/cfi-linux-release-170242.zip"
|
| ],
|
| - "name": "package build"
|
| + "name": "gsutil upload",
|
| + "~followup_annotations": [
|
| + "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/chromium-browser-cfi/linux-release/cfi-linux-release-170242.zip@@@"
|
| + ]
|
| + },
|
| + {
|
| + "cmd": [
|
| + "python",
|
| + "-u",
|
| + "\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
|
| + "[TMP_BASE]/chrome_staging_tmp_1/cfi-linux-release-170242.zip"
|
| + ],
|
| + "name": "cfi-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",
|
|
|