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 <borenet@google.com>
Reviewed-by: Ravi Mistry <rmistry@google.com>
diff --git a/infra/bots/recipes/swarm_RecreateSKPs.py b/infra/bots/recipes/swarm_RecreateSKPs.py
index 1665478..577385e 100644
--- a/infra/bots/recipes/swarm_RecreateSKPs.py
+++ b/infra/bots/recipes/swarm_RecreateSKPs.py
@@ -151,6 +151,7 @@
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 @@
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 @@
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 b48c657..4217354 100644
--- a/infra/bots/recipes/swarm_compile.py
+++ b/infra/bots/recipes/swarm_compile.py
@@ -25,6 +25,7 @@
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 b8f1e07..e5ad308 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 45834f8..349bbb9 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 2ac9c1d..cb34544 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 bae3e7b..c2fffd6 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 d8b9dba..88c01d3 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 4b51562..1f2eefd 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 abcd6d1..7d72042 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 c5e2af2..1f9c825 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 b6aa91f..8d34932 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 cfb50bc..1f0bc93 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 27c3b5c..729f4ac 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 5a732df..f856037 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 6926133..5c5db27 100644
--- a/infra/bots/recipes/swarm_ct_skps.py
+++ b/infra/bots/recipes/swarm_ct_skps.py
@@ -254,6 +254,7 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
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 @@
rietveld='codereview.chromium.org',
issue=1499623002,
patchset=1,
+ repository='https://skia.googlesource.com/skia.git',
)
)
@@ -477,6 +490,7 @@
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 6acd6cf..93d92cb 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 e92708c..630ef45 100644
--- a/infra/bots/recipes/swarm_housekeeper.py
+++ b/infra/bots/recipes/swarm_housekeeper.py
@@ -88,6 +88,7 @@
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 @@
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 19a26f7..bdd5bfc 100644
--- a/infra/bots/recipes/swarm_infra.py
+++ b/infra/bots/recipes/swarm_infra.py
@@ -38,6 +38,7 @@
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 @@
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 @@
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 d9d8b4d..e3a98a6 100644
--- a/infra/bots/recipes/swarm_presubmit.py
+++ b/infra/bots/recipes/swarm_presubmit.py
@@ -57,6 +57,7 @@
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/config/recipes.cfg b/infra/config/recipes.cfg
index 1afd398..575a368 100644
--- a/infra/config/recipes.cfg
+++ b/infra/config/recipes.cfg
@@ -5,7 +5,7 @@
project_id: "skia-recipes"
url: "https://skia.googlesource.com/skia-recipes.git"
branch: "master"
- revision: "e8da85864d929484dc5e75fb50af3b1323438e07"
+ revision: "38a221c163e04dc274872ffd63b6cef1d210d751"
}
deps {
project_id: "build"