Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json

Issue 2390753005: Double Builds for Blimp Integration Test Infrastructure on FYI bot (Closed)
Patch Set: Dirk comment Created 4 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
diff --git a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json b/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
similarity index 60%
copy from scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json
copy to scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
index 448d62643819c47acf2486a3a2672c9924d75ba2..16479a574f1a7099d1379ca256ae15975d0003ec 100644
--- a/scripts/slave/recipes/libyuv/libyuv.expected/client_libyuv_linux64_release__gn_.json
+++ b/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
@@ -1,66 +1,5 @@
[
{
- "cmd": [
- "python",
- "-u",
- "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
- "--show-path",
- "python",
- "RECIPE_PACKAGE_REPO[build]/scripts/slave/cleanup_temp.py"
- ],
- "name": "cleanup_temp"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
- "--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'custom_vars': {'root_dir': 'src'}, 'deps_file': 'DEPS', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/libyuv/libyuv'}]",
- "--patch_root",
- "src",
- "--revision_mapping_file",
- "{\"src\": \"got_revision\"}",
- "--git-cache-dir",
- "[GIT_CACHE]",
- "--output_json",
- "/path/to/tmp/json",
- "--revision",
- "src@deadbeef",
- "--output_manifest"
- ],
- "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@ \"src\": \"deadbeef\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"manifest\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"src\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"repository\": \"https://fake.org/src.git\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@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\": \"src\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"properties\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision\": \"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"got_revision_cp\": \"refs/heads/master@{#170242}\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@STEP_LOG_LINE@json.output@ \"root\": \"src\", @@@",
- "@@@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@\"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9\"@@@",
- "@@@SET_BUILD_PROPERTY@got_revision_cp@\"refs/heads/master@{#170242}\"@@@"
- ]
- },
- {
"cmd": [],
"name": "ensure_goma"
},
@@ -125,10 +64,9 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"runhooks"
],
- "cwd": "[SLAVE_BUILD]/src",
+ "cwd": "None",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
"GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
@@ -138,14 +76,23 @@
"cmd": [
"python",
"-u",
- "RECIPE_PACKAGE_REPO[depot_tools]/gn.py",
- "--root=[SLAVE_BUILD]/src",
+ "None/tools/mb/mb.py",
"gen",
- "//out/Release",
- "--args=is_debug=false target_cpu=\"x64\" use_goma=true goma_dir=\"[CACHE]/cipd/goma\""
+ "-m",
+ "chromium.fyi",
+ "-b",
+ "Blimp Android Test - Linux",
+ "--config-file",
+ "None/tools/mb/mb_config.pyl",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "[SLAVE_BUILD]/src/out-linux/Debug"
],
- "cwd": "[SLAVE_BUILD]/src",
- "name": "gn"
+ "cwd": "None",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "generate_build_files"
},
{
"cmd": [
@@ -162,25 +109,27 @@
"--target",
"Release",
"--src-dir",
- "[SLAVE_BUILD]/src",
+ "None",
"--goma-cache-dir",
"[GOMA_CACHE]",
"--buildbot-buildername",
- "Linux64 Release (GN)",
+ "Blimp Android Tester",
"--buildbot-mastername",
- "client.libyuv",
+ "chromium.fyi",
"--buildbot-slavename",
- "slavename",
+ "TestSlavename",
"--compiler",
"goma",
"--goma-jsonstatus",
"/path/to/tmp/json",
"--goma-service-account-json-file",
"/creds/service_accounts/service-account-goma-client.json",
+ "--out-dir",
+ "[SLAVE_BUILD]/src/out-linux/Debug",
"--goma-dir",
"[CACHE]/cipd/goma",
"--",
- "all"
+ "blimp"
],
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
@@ -192,6 +141,75 @@
]
},
{
+ "cmd": [
+ "python",
+ "-u",
+ "None/tools/mb/mb.py",
+ "gen",
+ "-m",
+ "chromium.fyi",
+ "-b",
+ "Blimp Android Test - Android",
+ "--config-file",
+ "None/tools/mb/mb_config.pyl",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "[SLAVE_BUILD]/src/out-android/Debug"
+ ],
+ "cwd": "None",
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "generate_build_files (2)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py",
+ "--show-path",
+ "python",
+ "RECIPE_PACKAGE_REPO[build]/scripts/slave/compile.py",
+ "--gsutil-py-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
+ "--ninja-path",
+ "RECIPE_PACKAGE_REPO[depot_tools]/ninja",
+ "--target",
+ "Release",
+ "--src-dir",
+ "None",
+ "--goma-cache-dir",
+ "[GOMA_CACHE]",
+ "--buildbot-buildername",
+ "Blimp Android Tester",
+ "--buildbot-mastername",
+ "chromium.fyi",
+ "--buildbot-slavename",
+ "TestSlavename",
+ "--compiler",
+ "goma",
+ "--goma-jsonstatus",
+ "/path/to/tmp/json",
+ "--goma-service-account-json-file",
+ "/creds/service_accounts/service-account-goma-client.json",
+ "--out-dir",
+ "[SLAVE_BUILD]/src/out-android/Debug",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "--",
+ "blimp",
+ "chrome_public_apk"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "compile (2)",
+ "~followup_annotations": [
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
+ ]
+ },
+ {
"name": "$result",
"recipe_result": null,
"status_code": 0

Powered by Google App Engine
This is Rietveld 408576698