AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Roll skia-recipes

Browse Source 
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 <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
This commit is contained in:
Eric Boren 2017-01-17 14:35:06 -05:00 committed by Skia Commit-Bot
parent a7d61a65ee
commit ad29aeeb76
20 changed files with 38 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
infra/bots/recipes/swarm_RecreateSKPs.py
View File

@ -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',

1
infra/bots/recipes/swarm_compile.py
View File

@ -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]') +

2
infra/bots/recipes/swarm_ct_skps.expected/CT_CPU_BENCH_10k_SKPs.json
View File

@ -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"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_DM_100k_SKPs.json
View File

@ -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\"]"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs.json
View File

@ -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\"]"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_DM_10k_SKPs_Trybot.json
View File

@ -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\"]"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs.json
View File

@ -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\"]"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_2slaves_failure.json
View File

@ -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\"]"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_DM_1m_SKPs_slave3_failure.json
View File

@ -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\"]"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_10k_SKPs.json
View File

@ -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"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_GPU_BENCH_1k_SKPs.json
View File

@ -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"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_100k_SKPs.json
View File

@ -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\"]"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs.json
View File

@ -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\"]"

2
infra/bots/recipes/swarm_ct_skps.expected/CT_IMG_DECODE_10k_SKPs_Trybot.json
View File

@ -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\"]"

14
infra/bots/recipes/swarm_ct_skps.py
View File

@ -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,
)
)

2
infra/bots/recipes/swarm_housekeeper.expected/Housekeeper-PerCommit-Trybot.json
View File

@ -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",

2
infra/bots/recipes/swarm_housekeeper.py
View File

@ -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',

3
infra/bots/recipes/swarm_infra.py
View File

@ -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]') +

1
infra/bots/recipes/swarm_presubmit.py
View File

@ -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]')

2
infra/config/recipes.cfg
View File

@ -5,7 +5,7 @@ deps {
project_id: "skia-recipes"
url: "https://skia.googlesource.com/skia-recipes.git"
branch: "master"
revision: "e8da85864d929484dc5e75fb50af3b1323438e07"
revision: "38a221c163e04dc274872ffd63b6cef1d210d751"
}
deps {
project_id: "build"