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

Issues Search
    My Issues | Starred     Open | Closed | All

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: slight change 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
« no previous file with comments | « scripts/slave/recipes/blimp/integration.py ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
diff --git a/scripts/slave/recipes/android/builder.expected/chromium_android_Android_x64_Builder__dbg__fail_check_licenses.json b/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
similarity index 80%
copy from scripts/slave/recipes/android/builder.expected/chromium_android_Android_x64_Builder__dbg__fail_check_licenses.json
copy to scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
index c159e404c2057e72242f5e4ff24c3737bf08430e..71be6c867d566d6bcee9375fc08d8cce0beb5e48 100644
--- a/scripts/slave/recipes/android/builder.expected/chromium_android_Android_x64_Builder__dbg__fail_check_licenses.json
+++ b/scripts/slave/recipes/blimp/integration.expected/Blimp_Android_Tester_test_pass.json
@@ -1,69 +1,11 @@
[
{
- "cmd": [],
- "name": "ensure_goma"
- },
- {
- "cmd": [
- "python",
- "-u",
- "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
- "--platform",
- "linux-amd64",
- "--dest-directory",
- "[SLAVE_BUILD]/cipd",
- "--json-output",
- "/path/to/tmp/json"
- ],
- "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@@@"
- ]
- },
- {
- "cmd": [
- "[SLAVE_BUILD]/cipd/cipd",
- "ensure",
- "--root",
- "[CACHE]/cipd/goma",
- "--list",
- "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
- "--json-output",
- "/path/to/tmp/json",
- "--service-account-json",
- "/creds/service_accounts/service-account-goma-client.json"
- ],
- "name": "ensure_goma.ensure_installed",
- "~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-goma_recipe_modu\", @@@",
- "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }, @@@",
- "@@@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-amd64\"@@@",
- "@@@STEP_LOG_LINE@json.output@ }@@@",
- "@@@STEP_LOG_LINE@json.output@ ]@@@",
- "@@@STEP_LOG_LINE@json.output@}@@@",
- "@@@STEP_LOG_END@json.output@@@"
- ]
- },
- {
"cmd": [
"python",
"-u",
"RECIPE_MODULE[depot_tools::bot_update]/resources/bot_update.py",
"--spec",
- "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}, {'custom_deps': {'src/chrome/test/data/firefox2_profile/searchplugins': None, 'src/chrome/test/data/firefox2_searchplugins': None, 'src/chrome/test/data/firefox3_profile/searchplugins': None, 'src/chrome/test/data/firefox3_searchplugins': None, 'src/chrome/test/data/osdd': None, 'src/chrome/test/data/perf/frame_rate/private': None, 'src/chrome/test/data/plugin': None, 'src/chrome/test/data/ssl/certs': None, 'src/data/autodiscovery': None, 'src/data/esctf': None, 'src/data/mach_ports': None, 'src/data/memory_test': None, 'src/data/mozilla_js_tests': None, 'src/data/page_cycler': None, 'src/data/selenium_core': None, 'src/data/tab_switching': None, 'src/tools/grit/grit/test/data': None, 'src/webkit/data/bmp_decoder': None, 'src/webkit/data/ico_decoder': None, 'src/webkit/data/test_shell/plugins': None, 'src/webkit/data/xbm_decoder': None}, 'deps_file': '.DEPS.git', 'managed': True, 'name': 'src-internal', 'url': 'https://chrome-internal.googlesource.com/chrome/src-internal.git'}]\ntarget_os = ['android']",
+ "cache_dir = '[GIT_CACHE]'\nsolutions = [{'deps_file': '.DEPS.git', 'managed': True, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\ntarget_os = ['android']",
"--patch_root",
"src",
"--revision_mapping_file",
@@ -156,6 +98,64 @@
]
},
{
+ "cmd": [],
+ "name": "ensure_goma"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_MODULE[depot_tools::cipd]/resources/bootstrap.py",
+ "--platform",
+ "linux-amd64",
+ "--dest-directory",
+ "[SLAVE_BUILD]/cipd",
+ "--json-output",
+ "/path/to/tmp/json"
+ ],
+ "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@@@"
+ ]
+ },
+ {
+ "cmd": [
+ "[SLAVE_BUILD]/cipd/cipd",
+ "ensure",
+ "--root",
+ "[CACHE]/cipd/goma",
+ "--list",
+ "infra/tools/cloudtail/linux-amd64 goma_recipe_module\ninfra_internal/goma/client/linux-amd64 release",
+ "--json-output",
+ "/path/to/tmp/json",
+ "--service-account-json",
+ "/creds/service_accounts/service-account-goma-client.json"
+ ],
+ "name": "ensure_goma.ensure_installed",
+ "~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-goma_recipe_modu\", @@@",
+ "@@@STEP_LOG_LINE@json.output@ \"package\": \"infra/tools/cloudtail/linux-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }, @@@",
+ "@@@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-amd64\"@@@",
+ "@@@STEP_LOG_LINE@json.output@ }@@@",
+ "@@@STEP_LOG_LINE@json.output@ ]@@@",
+ "@@@STEP_LOG_LINE@json.output@}@@@",
+ "@@@STEP_LOG_END@json.output@@@"
+ ]
+ },
+ {
"cmd": [
"python",
"-u",
@@ -192,10 +192,8 @@
"cwd": "[SLAVE_BUILD]/src",
"env": {
"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",
- "GYP_CHROMIUM_NO_ACTION": "1",
- "GYP_CROSSCOMPILE": "1",
- "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ "GYP_DEFINES": "component=static_library gomadir='[CACHE]/cipd/goma' target_arch=x64 use_goma=1",
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
},
"name": "gclient runhooks"
},
@@ -203,20 +201,102 @@
"cmd": [
"python",
"-u",
- "[SLAVE_BUILD]/src/android_webview/tools/webview_licenses.py",
- "scan"
+ "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "gen",
+ "-m",
+ "chromium.fyi",
+ "-b",
+ "Blimp Client Engine Integration",
+ "--config-file",
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "--phase",
+ "engine",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "[SLAVE_BUILD]/src/out-linux/Debug"
],
"cwd": "[SLAVE_BUILD]/src",
- "name": "check licenses",
+ "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",
+ "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",
+ "[SLAVE_BUILD]/src",
+ "--goma-cache-dir",
+ "[GOMA_CACHE]",
+ "--buildbot-buildername",
+ "Blimp Client Engine Integration",
+ "--buildbot-mastername",
+ "chromium.fyi",
+ "--buildbot-slavename",
+ "TestSlavename",
+ "--goma-deps-cache-file",
+ "Blimp_Client_Engine_Integration.gomadeps",
+ "--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",
+ "--",
+ "blimp"
+ ],
+ "env": {
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
+ },
+ "name": "compile",
"~followup_annotations": [
- "step returned non-zero exit code: 1",
- "@@@STEP_FAILURE@@@"
+ "@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
+ "@@@STEP_LOG_END@json.output (invalid)@@@"
]
},
{
"cmd": [
"python",
"-u",
+ "[SLAVE_BUILD]/src/tools/mb/mb.py",
+ "gen",
+ "-m",
+ "chromium.fyi",
+ "-b",
+ "Blimp Client Engine Integration",
+ "--config-file",
+ "[SLAVE_BUILD]/src/tools/mb/mb_config.pyl",
+ "--phase",
+ "client",
+ "--goma-dir",
+ "[CACHE]/cipd/goma",
+ "[SLAVE_BUILD]/src/out-android/Debug"
+ ],
+ "cwd": "[SLAVE_BUILD]/src",
+ "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",
@@ -226,34 +306,37 @@
"--ninja-path",
"RECIPE_PACKAGE_REPO[depot_tools]/ninja",
"--target",
- "Debug",
+ "Release",
"--src-dir",
"[SLAVE_BUILD]/src",
"--goma-cache-dir",
"[GOMA_CACHE]",
"--buildbot-buildername",
- "Android x64 Builder (dbg)",
+ "Blimp Client Engine Integration",
"--buildbot-mastername",
- "chromium.android",
+ "chromium.fyi",
"--buildbot-slavename",
"TestSlavename",
"--goma-deps-cache-file",
- "Android_x64_Builder__dbg_.gomadeps",
+ "Blimp_Client_Engine_Integration.gomadeps",
"--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",
- "PATH": "[SLAVE_BUILD]/src/third_party/android_tools/sdk/platform-tools:[SLAVE_BUILD]/src/build/android:%(PATH)s"
+ "GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"
},
- "name": "compile",
+ "name": "compile (2)",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
"@@@STEP_LOG_END@json.output (invalid)@@@"
« no previous file with comments | « scripts/slave/recipes/blimp/integration.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698