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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json

Issue 2270963002: Make skia recipes explicitly set GIT_MODE (Closed) Base URL: https://chromium.googlesource.com/chromium/tools/build.git@master
Patch Set: Rebase Created 4 years, 4 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/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
diff --git a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
index 670ad1a28c41a9107755e781e0d688b2dec4ff16..a9d5a51fa12dffdf4988c8361ff79ee382e802c1 100644
--- a/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
+++ b/scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot.json
@@ -45,7 +45,7 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"config",
"--spec",
- "cache_dir = None\nsolutions = [{'deps_file': 'DEPS', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
+ "cache_dir = None\nsolutions = [{'deps_file': '.DEPS.git', 'managed': False, 'name': 'skia', 'url': 'https://skia.googlesource.com/skia.git'}]\ntarget_os = ['llvm']"
],
"env": {
"PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
@@ -56,21 +56,16 @@
"cmd": [
"python",
"-u",
- "[BUILD]/scripts/slave/gclient_safe_revert.py",
- ".",
- "[DEPOT_TOOLS]/gclient"
- ],
- "name": "gclient revert"
- },
- {
- "cmd": [
- "python",
- "-u",
"RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
"sync",
+ "--verbose",
+ "--with_branch_heads",
"--nohooks",
+ "-j8",
+ "--reset",
"--force",
- "--verbose",
+ "--upstream",
+ "--no-nag-max",
"--delete_unversioned_trees",
"--revision",
"skia@abc123",
@@ -85,18 +80,50 @@
"@@@STEP_LOG_LINE@json.output@{@@@",
"@@@STEP_LOG_LINE@json.output@ \"solutions\": {@@@",
"@@@STEP_LOG_LINE@json.output@ \"skia/\": {@@@",
- "@@@STEP_LOG_LINE@json.output@ \"revision\": 164710@@@",
+ "@@@STEP_LOG_LINE@json.output@ \"revision\": \"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@ }@@@",
"@@@STEP_LOG_LINE@json.output@}@@@",
"@@@STEP_LOG_END@json.output@@@",
- "@@@SET_BUILD_PROPERTY@got_revision@164710@@@"
+ "@@@SET_BUILD_PROPERTY@got_revision@\"9046e2e693bb92a76e972b694580e5d17ad10748\"@@@"
]
},
{
"cmd": [
"python",
"-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+ "recurse",
+ "git",
+ "config",
+ "user.name",
+ "local_bot"
+ ],
+ "env": {
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "gclient recurse (git config user.name)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
+ "RECIPE_PACKAGE_REPO[depot_tools]/gclient.py",
+ "recurse",
+ "git",
+ "config",
+ "user.email",
+ "local_bot@example.com"
+ ],
+ "env": {
+ "PATH": "%(PATH)s:RECIPE_PACKAGE_REPO[depot_tools]"
+ },
+ "name": "gclient recurse (git config user.email)"
+ },
+ {
+ "cmd": [
+ "python",
+ "-u",
"[DEPOT_TOOLS]/apply_issue.py",
"-r",
"[SLAVE_BUILD]/skia",
@@ -618,7 +645,7 @@
"swarm_out_dir=${ISOLATED_OUTDIR}",
"patchset=1",
"issue=500",
- "revision=164710"
+ "revision=9046e2e693bb92a76e972b694580e5d17ad10748"
],
"name": "[trigger] test_skia on Ubuntu",
"~followup_annotations": [
@@ -739,8 +766,8 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/164710.cov",
- "gs://skia-infra/coverage-raw-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/164710.cov"
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/9046e2e693bb92a76e972b694580e5d17ad10748.cov",
+ "gs://skia-infra/coverage-raw-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/9046e2e693bb92a76e972b694580e5d17ad10748.cov"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -748,7 +775,7 @@
},
"name": "gsutil upload raw coverage data",
"~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-infra/coverage-raw-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/164710.cov@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-infra/coverage-raw-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/9046e2e693bb92a76e972b694580e5d17ad10748.cov@@@"
]
},
{
@@ -756,8 +783,8 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/nanobench_164710.json",
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/nanobench_164710_1408633190.json"
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748.json",
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748_1408633190.json"
],
"name": "nanobench JSON"
},
@@ -766,7 +793,7 @@
"python",
"-u",
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/nanobench_164710.json"
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/nanobench_9046e2e693bb92a76e972b694580e5d17ad10748.json"
],
"name": "old nanobench JSON",
"~followup_annotations": [
@@ -785,7 +812,7 @@
"Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot",
"5",
"[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0",
- "164710",
+ "9046e2e693bb92a76e972b694580e5d17ad10748",
"[DEPOT_TOOLS]/third_party/gsutil/gsutil",
"500"
],
@@ -801,8 +828,8 @@
"python",
"-u",
"\nimport shutil\nimport sys\nshutil.copy(sys.argv[1], sys.argv[2])\n",
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_164710.json",
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_164710_1408633190.json"
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_9046e2e693bb92a76e972b694580e5d17ad10748.json",
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_9046e2e693bb92a76e972b694580e5d17ad10748_1408633190.json"
],
"name": "Line-by-line coverage JSON"
},
@@ -811,7 +838,7 @@
"python",
"-u",
"\nimport os\nimport sys\nos.remove(sys.argv[1])\n",
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_164710.json"
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_9046e2e693bb92a76e972b694580e5d17ad10748.json"
],
"name": "old line-by-line coverage JSON",
"~followup_annotations": [
@@ -831,8 +858,8 @@
"RECIPE_PACKAGE_REPO[depot_tools]/gsutil.py",
"----",
"cp",
- "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_164710_1408633190.json",
- "gs://skia-infra/coverage-json-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/coverage_by_line_164710_1408633190.json"
+ "[SLAVE_BUILD]/swarming_temp_dir/outputs/test_skia/0/coverage_by_line_9046e2e693bb92a76e972b694580e5d17ad10748_1408633190.json",
+ "gs://skia-infra/coverage-json-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/coverage_by_line_9046e2e693bb92a76e972b694580e5d17ad10748_1408633190.json"
],
"env": {
"AWS_CREDENTIAL_FILE": null,
@@ -840,7 +867,7 @@
},
"name": "gsutil upload line-by-line coverage data",
"~followup_annotations": [
- "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-infra/coverage-json-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/coverage_by_line_164710_1408633190.json@@@"
+ "@@@STEP_LINK@gsutil.upload@https://storage.cloud.google.com/skia-infra/coverage-json-v1/trybot/2012/05/14/12/Test-Ubuntu-Clang-GCE-CPU-AVX2-x86_64-Coverage-Trybot/5/500/coverage_by_line_9046e2e693bb92a76e972b694580e5d17ad10748_1408633190.json@@@"
]
},
{
« no previous file with comments | « scripts/slave/recipes/skia/swarm_trigger.expected/Test-Mac-Clang-MacMini6.2-CPU-AVX-x86_64-Release.json ('k') | scripts/slave/recipes/skia/swarm_trigger.expected/Test-Ubuntu-GCC-GCE-CPU-AVX2-x86_64-Debug.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698