scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Cronet_Builder.json - Issue 2308683002: [Android] Set up continuous builder + trybot for cronet.

Unified Diff: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Cronet_Builder.json

Issue 2308683002: [Android] Set up continuous builder + trybot for cronet. (Closed)

Patch Set: update expectations Created 4 years, 3 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

« no previous file with comments | « scripts/slave/recipe_modules/chromium_tests/trybots.py ('k') | scripts/slave/recipes/chromium_trybot.expected/full_tryserver_chromium_android_android_cronet.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Cronet_Builder.json

diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_x64_Builder__dbg_.json b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Cronet_Builder.json

similarity index 84%

copy from scripts/slave/recipes/chromium.expected/full_chromium_android_Android_x64_Builder__dbg_.json

copy to scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Cronet_Builder.json

index 8dec783bd9369a891b341a4e48cc3777dc3cbcf3..3e2aa3ceb5257e4149032cc57734bdfa6ee4e43f 100644

--- a/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_x64_Builder__dbg_.json

+++ b/scripts/slave/recipes/chromium.expected/full_chromium_android_Android_Cronet_Builder.json

@@ -4,7 +4,7 @@

"python",

"-u",

"\nimport sys, os\npath = sys.argv[1]\nmode = int(sys.argv[2])\nif not os.path.isdir(path):\n if os.path.exists(path):\n print \"%s exists but is not a dir\" % path\n sys.exit(1)\n os.makedirs(path, mode)\n",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_",

+ "[BUILDER_CACHE]/Android_Cronet_Builder",

"511"

"name": "makedirs checkout path",

@@ -29,7 +29,7 @@

"--master",

"chromium.android",

"--builder",

- "Android x64 Builder (dbg)",

+ "Android Cronet Builder",

"--slave",

"TestSlavename",

"--spec",

@@ -47,7 +47,7 @@

"--force",

"--output_manifest"

- "cwd": "[BUILDER_CACHE]/Android_x64_Builder__dbg_",

+ "cwd": "[BUILDER_CACHE]/Android_Cronet_Builder",

"env": {

"GCLIENT_KILL_GIT_FETCH_AFTER": "1200",

"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

@@ -193,13 +193,13 @@

"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",

"runhooks"

- "cwd": "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src",

+ "cwd": "[BUILDER_CACHE]/Android_Cronet_Builder/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 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=x64 use_goma=1",

- "PATH": "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

+ "GYP_DEFINES": "OS=android component=static_library fastbuild=1 ffmpeg_branding=Chrome gomadir='[CACHE]/cipd/goma' proprietary_codecs=1 target_arch=arm use_goma=1",

+ "PATH": "[BUILDER_CACHE]/Android_Cronet_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Cronet_Builder/src/build/android:%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"

"name": "gclient runhooks"

@@ -207,16 +207,16 @@

"cmd": [

"python",

"-u",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/testing/scripts/get_compile_targets.py",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src/testing/scripts/get_compile_targets.py",

"--output",

"/path/to/tmp/json",

"--",

"--build-config-fs",

- "Debug",

+ "Release",

"--paths",

- "{\"checkout\": \"[BUILDER_CACHE]/Android_x64_Builder__dbg_/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",

+ "{\"checkout\": \"[BUILDER_CACHE]/Android_Cronet_Builder/src\", \"runit.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/tools/runit.py\", \"runtest.py\": \"RECIPE_PACKAGE_REPO[build]/scripts/slave/runtest.py\"}",

"--properties",

- "{\"buildername\": \"Android x64 Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"

+ "{\"buildername\": \"Android Cronet Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"slavename\": \"TestSlavename\", \"target_platform\": \"android\"}"

"name": "get compile targets for scripts",

"~followup_annotations": [

@@ -229,12 +229,12 @@

"python",

"-u",

"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/testing/buildbot/chromium.android.json",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src/testing/buildbot/chromium.android.json",

"/path/to/tmp/json"

"name": "read test spec (chromium.android.json)",

"~followup_annotations": [

- "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_x64_Builder__dbg_/src/testing/buildbot/chromium.android.json@@@",

+ "@@@STEP_TEXT@path: [BUILDER_CACHE]/Android_Cronet_Builder/src/testing/buildbot/chromium.android.json@@@",

"@@@STEP_LOG_LINE@json.output@{}@@@",

"@@@STEP_LOG_END@json.output@@@"

]

@@ -255,10 +255,10 @@

"python",

"-u",

"\nimport shutil, sys, os\nshutil.rmtree(sys.argv[1], True)\nshutil.rmtree(sys.argv[2], True)\ntry:\n os.remove(sys.argv[3])\nexcept OSError:\n pass\nfor base, _dirs, files in os.walk(sys.argv[4]):\n for f in files:\n if f.endswith('.pyc'):\n os.remove(os.path.join(base, f))\n",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/out/Debug/debug_info_dumps",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/out/Debug/test_logs",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/out/build_product.zip",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src"

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src/out/Release/debug_info_dumps",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src/out/Release/test_logs",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src/out/build_product.zip",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src"

"name": "clean local files",

"~followup_annotations": [

@@ -280,8 +280,8 @@

{

"allow_subannotations": false,

"cmd": [

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/build/tree_truth.sh",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src/build/tree_truth.sh",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src",

"src"

"name": "tree truth steps"

@@ -290,19 +290,19 @@

"cmd": [

"python",

"-u",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/tools/mb/mb.py",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src/tools/mb/mb.py",

"gen",

"-m",

"chromium.android",

"-b",

- "Android x64 Builder (dbg)",

+ "Android Cronet Builder",

"--config-file",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/tools/mb/mb_config.pyl",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src/tools/mb/mb_config.pyl",

"--goma-dir",

"[CACHE]/cipd/goma",

- "//out/Debug"

+ "//out/Release"

- "cwd": "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src",

+ "cwd": "[BUILDER_CACHE]/Android_Cronet_Builder/src",

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json"

@@ -321,13 +321,13 @@

"--ninja-path",

"RECIPE_PACKAGE_REPO[depot_tools]/ninja",

"--target",

- "Debug",

+ "Release",

"--src-dir",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src",

"--goma-cache-dir",

"[GOMA_CACHE]",

"--buildbot-buildername",

- "Android x64 Builder (dbg)",

+ "Android Cronet Builder",

"--buildbot-mastername",

"chromium.android",

"--buildbot-slavename",

@@ -348,7 +348,7 @@

"env": {

"GOMA_SERVICE_ACCOUNT_JSON_FILE": "/creds/service_accounts/service-account-goma-client.json",

- "PATH": "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_x64_Builder__dbg_/src/build/android:%(PATH)s"

+ "PATH": "[BUILDER_CACHE]/Android_Cronet_Builder/src/third_party/android_tools/sdk/platform-tools:[BUILDER_CACHE]/Android_Cronet_Builder/src/build/android:%(PATH)s"

"name": "compile",

"~followup_annotations": [

@@ -366,21 +366,21 @@

"python",

"RECIPE_PACKAGE_REPO[build]/scripts/slave/zip_build.py",

"--target",

- "Debug",

+ "Release",

"--gsutil-py-path",

"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",

"--staging-dir",

"[CACHE]/chrome_staging",

"--src-dir",

- "[BUILDER_CACHE]/Android_x64_Builder__dbg_/src",

+ "[BUILDER_CACHE]/Android_Cronet_Builder/src",

"--build-url",

- "gs://chromium-android-archive/chromium.android/Android x64 Builder (dbg)",

+ "gs://chromium-android-archive/chromium.android/Android Cronet Builder",

"--build_revision",

"f27fede2220bcd326aee3e86ddfd4ebd0fe58cb9",

"--factory-properties",

- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android x64 Builder (dbg)\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"build_data_dir\": \"[ROOT]/build_data_dir\", \"buildername\": \"Android Cronet Builder\", \"buildnumber\": 571, \"mastername\": \"chromium.android\", \"parent_buildername\": null, \"path_config\": \"kitchen\", \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",

"--build-properties",

"name": "package build"