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

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

Issue 1414053007: add receipes for goma staging (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Created 5 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/chromium.expected/full_goma_Chromium_Mac_Goma_Staging.json
diff --git a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_9_Goma_Canary.json b/scripts/slave/recipes/chromium.expected/full_goma_Chromium_Mac_Goma_Staging.json
similarity index 84%
copy from scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_9_Goma_Canary.json
copy to scripts/slave/recipes/chromium.expected/full_goma_Chromium_Mac_Goma_Staging.json
index 9be5d1cd4fc0b1f4706e1cc47f19ebeb81310144..be92121a2572aafaac2c0f2f9b1d873025227de6 100644
--- a/scripts/slave/recipes/chromium.expected/full_chromium_fyi_Chromium_Mac_10_9_Goma_Canary.json
+++ b/scripts/slave/recipes/chromium.expected/full_goma_Chromium_Mac_Goma_Staging.json
@@ -3,25 +3,11 @@
"cmd": [
"python",
"-u",
- "[DEPOT_TOOLS]/gclient.py",
- "sync",
- "--verbose",
- "--force",
- "--revision",
- "build/goma@refs/heads/master"
- ],
- "cwd": "[BUILD]",
- "name": "gclient update goma canary"
- },
- {
- "cmd": [
- "python",
- "-u",
"[BUILD]/scripts/slave/bot_update.py",
"--master",
- "chromium.fyi",
+ "goma",
"--builder",
- "Chromium Mac 10.9 Goma Canary",
+ "Chromium Mac Goma Staging",
"--slave",
"TestSlavename",
"--spec",
@@ -111,6 +97,7 @@
],
"cwd": "[SLAVE_BUILD]",
"env": {
+ "GOMA_STUBBY_PROXY_IP_ADDRESS": "sandbox.google.com",
"GYP_DEFINES": "clang=1 component=static_library gomadir='[BUILD]/goma' target_arch=x64 use_goma=1"
},
"name": "gclient runhooks"
@@ -120,13 +107,13 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json",
+ "[SLAVE_BUILD]/src/testing/buildbot/goma.json",
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
"name": "read test spec",
"~followup_annotations": [
- "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/chromium.fyi.json@@@",
+ "@@@STEP_TEXT@path: [SLAVE_BUILD]/src/testing/buildbot/goma.json@@@",
"@@@STEP_LOG_LINE@json.output@{}@@@",
"@@@STEP_LOG_END@json.output@@@"
]
@@ -144,7 +131,7 @@
"--paths",
"{\"build\": \"[BUILD]\", \"checkout\": \"[SLAVE_BUILD]/src\"}",
"--properties",
- "{\"buildername\": \"Chromium Mac 10.9 Goma Canary\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
+ "{\"buildername\": \"Chromium Mac Goma Staging\", \"buildnumber\": 571, \"mastername\": \"goma\", \"slavename\": \"TestSlavename\", \"target_platform\": \"mac\"}"
],
"cwd": "[SLAVE_BUILD]",
"name": "get compile targets for scripts",
@@ -174,6 +161,9 @@
"/path/to/tmp/json"
],
"cwd": "[SLAVE_BUILD]",
+ "env": {
+ "GOMA_STUBBY_PROXY_IP_ADDRESS": "sandbox.google.com"
+ },
"name": "clang_revision",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output@{@@@",
@@ -199,14 +189,16 @@
"/path/to/tmp/json",
"--goma-dir",
"[BUILD]/goma",
- "--goma-hermetic",
- "error",
+ "--clobber",
"--",
"base_unittests",
"chromium_builder_tests",
"content_unittests"
],
"cwd": "[SLAVE_BUILD]",
+ "env": {
+ "GOMA_STUBBY_PROXY_IP_ADDRESS": "sandbox.google.com"
+ },
"name": "compile",
"~followup_annotations": [
"@@@STEP_LOG_LINE@json.output (invalid)@null@@@",
@@ -231,15 +223,15 @@
"--target",
"Release",
"--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Chromium Mac 10.9 Goma Canary\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Chromium Mac Goma Staging\", \"buildnumber\": 571, \"mastername\": \"goma\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Chromium Mac 10.9 Goma Canary\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Chromium Mac Goma Staging\", \"buildnumber\": 571, \"mastername\": \"goma\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--annotate=gtest",
"--test-type=base_unittests",
"--step-name=base_unittests",
"--test-launcher-summary-output",
"/path/to/tmp/json",
- "--builder-name=Chromium Mac 10.9 Goma Canary",
+ "--builder-name=Chromium Mac Goma Staging",
"--slave-name=TestSlavename",
"--build-number=571",
"base_unittests"
@@ -256,15 +248,15 @@
"--target",
"Release",
"--factory-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Chromium Mac 10.9 Goma Canary\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Chromium Mac Goma Staging\", \"buildnumber\": 571, \"mastername\": \"goma\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--build-properties",
- "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Chromium Mac 10.9 Goma Canary\", \"buildnumber\": 571, \"mastername\": \"chromium.fyi\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
+ "{\"blamelist\": [\"cool_dev1337@chromium.org\", \"hax@chromium.org\"], \"buildername\": \"Chromium Mac Goma Staging\", \"buildnumber\": 571, \"mastername\": \"goma\", \"parent_buildername\": null, \"recipe\": \"chromium\", \"slavename\": \"TestSlavename\", \"workdir\": \"/path/to/workdir/TestSlavename\"}",
"--annotate=gtest",
"--test-type=content_unittests",
"--step-name=content_unittests",
"--test-launcher-summary-output",
"/path/to/tmp/json",
- "--builder-name=Chromium Mac 10.9 Goma Canary",
+ "--builder-name=Chromium Mac Goma Staging",
"--slave-name=TestSlavename",
"--build-number=571",
"content_unittests"

Powered by Google App Engine
This is Rietveld 408576698