From ad29aeeb768c048bb2f1229db8f3b7100a91ac42 Mon Sep 17 00:00:00 2001 From: Eric Boren Date: Tue, 17 Jan 2017 14:35:06 -0500 Subject: Roll skia-recipes 6815aa7 Use skia/bin/gn instead of skia/buildtools/$(PLATFORM)/gn ef0ad89 core: Obtain the primary repo URL from the "repository" property BUG=skia: Change-Id: I5cd47dd47747565c141240241b1373b34d69bee5 Reviewed-on: https://skia-review.googlesource.com/7123 Commit-Queue: Eric Boren Reviewed-by: Ravi Mistry --- infra/bots/recipes/swarm_RecreateSKPs.py | 3 +++ infra/bots/recipes/swarm_compile.py | 1 + .../swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json | 2 +- .../recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json | 2 +- .../recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json | 2 +- .../swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json | 2 +- .../bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json | 2 +- .../CT_DM_1m_SKPs_2slaves_failure.json | 2 +- .../CT_DM_1m_SKPs_slave3_failure.json | 2 +- .../swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json | 2 +- .../swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json | 2 +- .../swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json | 2 +- .../swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json | 2 +- .../CT_IMG_DECODE_10k_SKPs_Trybot.json | 2 +- infra/bots/recipes/swarm_ct_skps.py | 14 ++++++++++++++ .../Housekeeper-PerCommit-Trybot.json | 2 +- infra/bots/recipes/swarm_housekeeper.py | 2 ++ infra/bots/recipes/swarm_infra.py | 3 +++ infra/bots/recipes/swarm_presubmit.py | 1 + 19 files changed, 37 insertions(+), 13 deletions(-) (limited to 'infra/bots/recipes') diff --git a/infra/bots/recipes/swarm_RecreateSKPs.py b/infra/bots/recipes/swarm_RecreateSKPs.py index 1665478837..577385e395 100644 --- a/infra/bots/recipes/swarm_RecreateSKPs.py +++ b/infra/bots/recipes/swarm_RecreateSKPs.py @@ -151,6 +151,7 @@ def GenTests(api): api.properties(buildername=builder, mastername=mastername, slavename=slavename, + repository='https://skia.googlesource.com/skia.git', revision='abc123', buildnumber=2, path_config='kitchen', @@ -164,6 +165,7 @@ def GenTests(api): api.properties(buildername=builder, mastername=mastername, slavename=slavename, + repository='https://skia.googlesource.com/skia.git', revision='abc123', buildnumber=2, path_config='kitchen', @@ -176,6 +178,7 @@ def GenTests(api): api.properties(buildername=builder, mastername=mastername, slavename=slavename, + repository='https://skia.googlesource.com/skia.git', revision='abc123', buildnumber=2, path_config='kitchen', diff --git a/infra/bots/recipes/swarm_compile.py b/infra/bots/recipes/swarm_compile.py index b48c6577c4..4217354a50 100644 --- a/infra/bots/recipes/swarm_compile.py +++ b/infra/bots/recipes/swarm_compile.py @@ -25,6 +25,7 @@ def GenTests(api): mastername='fake-master', slavename='fake-slave', buildnumber=5, + repository='https://skia.googlesource.com/skia.git', revision='abc123', path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json index b8f1e07063..e5ad3085aa 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json index 45834f869b..349bbb9d36 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json index 2ac9c1de14..cb34544811 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json index bae3e7b97f..c2fffd6256 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json @@ -117,7 +117,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json index d8b9dba070..88c01d30f2 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json index 4b51562106..1f2eefd619 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json index abcd6d1e45..7d720421fa 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json index c5e2af286a..1f9c825c21 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json index b6aa91ff59..8d349322e1 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Release", "--args=cc=\"gcc\" cxx=\"g++\" is_debug=false" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json index cfb50bc9b2..1f0bc9330f 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json index 27c3b5c382..729f4ac5b3 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" diff --git a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json index 5a732dfc5f..f85603773f 100644 --- a/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json +++ b/infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json @@ -111,7 +111,7 @@ }, { "cmd": [ - "gn", + "[CUSTOM_/_B_WORK]/skia/bin/gn", "gen", "[START_DIR]/out/Debug", "--args=cc=\"gcc\" cxx=\"g++\" extra_cflags=[\"-O1\"]" diff --git a/infra/bots/recipes/swarm_ct_skps.py b/infra/bots/recipes/swarm_ct_skps.py index 69261333bb..5c5db2703d 100644 --- a/infra/bots/recipes/swarm_ct_skps.py +++ b/infra/bots/recipes/swarm_ct_skps.py @@ -254,6 +254,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) ) @@ -270,6 +271,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) ) @@ -285,6 +287,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) ) @@ -301,6 +304,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) ) @@ -317,6 +321,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) + api.path.exists( @@ -337,6 +342,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) + api.path.exists( @@ -357,6 +363,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) + api.path.exists( @@ -376,6 +383,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) ) @@ -392,6 +400,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) + api.expect_exception('Exception') @@ -409,6 +418,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) + api.expect_exception('Exception') @@ -426,6 +436,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) ) @@ -443,6 +454,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) ) @@ -462,6 +474,7 @@ def GenTests(api): rietveld='codereview.chromium.org', issue=1499623002, patchset=1, + repository='https://skia.googlesource.com/skia.git', ) ) @@ -477,6 +490,7 @@ def GenTests(api): swarm_out_dir='[SWARM_OUT_DIR]', ct_num_slaves=ct_num_slaves, num_per_slave=num_per_slave, + repository='https://skia.googlesource.com/skia.git', revision=skia_revision, ) ) diff --git a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json index 6acd6cfec3..93d92cba4d 100644 --- a/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json +++ b/infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json @@ -35,7 +35,7 @@ "--git-cache-dir", "[CUSTOM_/_B_CACHE]", "--gerrit_repo", - "https://skia.googlesource.com/skia", + "https://skia.googlesource.com/skia.git", "--gerrit_ref", "refs/changes/89/456789/12", "--output_json", diff --git a/infra/bots/recipes/swarm_housekeeper.py b/infra/bots/recipes/swarm_housekeeper.py index e92708ce29..630ef45b90 100644 --- a/infra/bots/recipes/swarm_housekeeper.py +++ b/infra/bots/recipes/swarm_housekeeper.py @@ -88,6 +88,7 @@ def GenTests(api): mastername='client.skia.fyi', slavename='skiabot-linux-housekeeper-000', buildnumber=5, + repository='https://skia.googlesource.com/skia.git', revision='abc123', path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + @@ -99,6 +100,7 @@ def GenTests(api): mastername='client.skia.fyi', slavename='skiabot-linux-housekeeper-000', buildnumber=5, + repository='https://skia.googlesource.com/skia.git', revision='abc123', path_config='kitchen', patch_storage='gerrit', diff --git a/infra/bots/recipes/swarm_infra.py b/infra/bots/recipes/swarm_infra.py index 19a26f723f..bdd5bfc8ac 100644 --- a/infra/bots/recipes/swarm_infra.py +++ b/infra/bots/recipes/swarm_infra.py @@ -38,6 +38,7 @@ def GenTests(api): mastername='client.skia.fyi', slavename='dummy-slave', buildnumber=5, + repository='https://skia.googlesource.com/skia.git', revision='abc123', path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') @@ -49,6 +50,7 @@ def GenTests(api): mastername='client.skia.fyi', slavename='dummy-slave', buildnumber=5, + repository='https://skia.googlesource.com/skia.git', revision='abc123', path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + @@ -61,6 +63,7 @@ def GenTests(api): mastername='client.skia.fyi', slavename='dummy-slave', buildnumber=5, + repository='https://skia.googlesource.com/skia.git', revision='abc123', path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') + diff --git a/infra/bots/recipes/swarm_presubmit.py b/infra/bots/recipes/swarm_presubmit.py index d9d8b4d24a..e3a98a6b37 100644 --- a/infra/bots/recipes/swarm_presubmit.py +++ b/infra/bots/recipes/swarm_presubmit.py @@ -57,6 +57,7 @@ def GenTests(api): mastername='client.skia.fyi', slavename='dummy-slave', buildnumber=5, + repository='https://skia.googlesource.com/skia.git', revision='abc123', path_config='kitchen', swarm_out_dir='[SWARM_OUT_DIR]') -- cgit v1.2.3