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

[infra] Remove failing InfraTests_Win job

Browse Source 
And fix a Python typo

Change-Id: I2e63c16865ec44cf1506ea9392155b2b687042b3
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/432776
Reviewed-by: Eric Boren <borenet@google.com>
This commit is contained in:
Kevin Lubick 2021-07-26 10:39:39 -04:00
parent 613ca2b916
commit 4765fd0eb7
4 changed files with 3 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
infra/bots/jobs.json
View File

@ -214,7 +214,6 @@
{"name": "Housekeeper-PerCommit-InfraTests_Linux", {"name": "Housekeeper-PerCommit-InfraTests_Linux",
"cq_config": {} "cq_config": {}
}, },
{"name": "Housekeeper-PerCommit-InfraTests_Win"},
{"name": "Housekeeper-PerCommit-IsolateMSKP"}, {"name": "Housekeeper-PerCommit-IsolateMSKP"},
{"name": "Housekeeper-PerCommit-IsolateSKP"}, {"name": "Housekeeper-PerCommit-IsolateSKP"},
{"name": "Housekeeper-PerCommit-IsolateSVG"}, {"name": "Housekeeper-PerCommit-IsolateSVG"},

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

@ -66,7 +66,7 @@ def RunSteps(api):
def GenTests(api): def GenTests(api):
yield ( yield (
api.test('infra_tests') + api.test('infra_tests') +
api.properties(buildername='Housekeeper-PerCommit-InfraTests_Win', api.properties(buildername='Housekeeper-PerCommit-InfraTests_Linux',
repository='https://skia.googlesource.com/skia.git', repository='https://skia.googlesource.com/skia.git',
path_config='kitchen', path_config='kitchen',
swarm_out_dir='[SWARM_OUT_DIR]') swarm_out_dir='[SWARM_OUT_DIR]')

134
infra/bots/tasks.json
View File

@ -869,11 +869,6 @@
"Housekeeper-PerCommit-InfraTests_Linux" "Housekeeper-PerCommit-InfraTests_Linux"
] ]
}, },
"Housekeeper-PerCommit-InfraTests_Win": {
"tasks": [
"Housekeeper-PerCommit-InfraTests_Win"
]
},
"Housekeeper-PerCommit-IsolateMSKP": { "Housekeeper-PerCommit-IsolateMSKP": {
"tasks": [ "tasks": [
"Housekeeper-PerCommit-IsolateMSKP" "Housekeeper-PerCommit-IsolateMSKP"
@ -19379,135 +19374,6 @@
"max_attempts": 2, "max_attempts": 2,
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com" "service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
}, },
"Housekeeper-PerCommit-InfraTests_Win": {
"caches": [
{
"name": "git",
"path": "cache/git"
},
{
"name": "git_cache",
"path": "cache/git_cache"
},
{
"name": "go_cache",
"path": "cache/go_cache"
},
{
"name": "gopath",
"path": "cache/gopath"
},
{
"name": "vpython",
"path": "cache/vpython"
}
],
"casSpec": "whole-repo",
"cipd_packages": [
{
"name": "infra/3pp/tools/cpython/windows-amd64",
"path": "cipd_bin_packages/cpython",
"version": "version:2@2.7.18.chromium.39"
},
{
"name": "infra/3pp/tools/cpython3/windows-amd64",
"path": "cipd_bin_packages/cpython3",
"version": "version:2@3.8.10.chromium.19"
},
{
"name": "infra/3pp/tools/git/windows-amd64",
"path": "cipd_bin_packages",
"version": "version:2@2.32.0.chromium.6"
},
{
"name": "infra/gsutil",
"path": "cipd_bin_packages",
"version": "version:4.46"
},
{
"name": "infra/tools/git/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:cadd7dad6e9466c9988ec9eaed70210f2aa1ca86"
},
{
"name": "infra/tools/luci-auth/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:cadd7dad6e9466c9988ec9eaed70210f2aa1ca86"
},
{
"name": "infra/tools/luci/git-credential-luci/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:cadd7dad6e9466c9988ec9eaed70210f2aa1ca86"
},
{
"name": "infra/tools/luci/kitchen/${platform}",
"path": ".",
"version": "git_revision:cadd7dad6e9466c9988ec9eaed70210f2aa1ca86"
},
{
"name": "infra/tools/luci/vpython-native/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:cadd7dad6e9466c9988ec9eaed70210f2aa1ca86"
},
{
"name": "infra/tools/luci/vpython/${platform}",
"path": "cipd_bin_packages",
"version": "git_revision:cadd7dad6e9466c9988ec9eaed70210f2aa1ca86"
},
{
"name": "skia/bots/go_win",
"path": "go",
"version": "version:3"
}
],
"command": [
"cipd_bin_packages/vpython3${EXECUTABLE_SUFFIX}",
"-u",
"skia/infra/bots/run_recipe.py",
"${ISOLATED_OUTDIR}",
"infra",
"{\"$kitchen\":{\"devshell\":true,\"git_auth\":true},\"buildername\":\"Housekeeper-PerCommit-InfraTests_Win\",\"repository\":\"<(REPO)\",\"swarm_out_dir\":\"output_ignored\"}",
"skia"
],
"dependencies": [
"Housekeeper-PerCommit-BundleRecipes"
],
"dimensions": [
"cpu:x86-64-Haswell_GCE",
"gpu:none",
"machine_type:n1-standard-16",
"os:Windows-Server-17763",
"pool:Skia"
],
"env_prefixes": {
"GOROOT": [
"go/go"
],
"PATH": [
"cipd_bin_packages/cpython",
"cipd_bin_packages/cpython/bin",
"cipd_bin_packages/cpython3",
"cipd_bin_packages/cpython3/bin",
"cipd_bin_packages",
"cipd_bin_packages/bin",
"go/go/bin"
],
"VPYTHON_LOG_TRACE": [
"1"
],
"VPYTHON_VIRTUALENV_ROOT": [
"cache/vpython"
]
},
"execution_timeout_ns": 3600000000000,
"extra_tags": {
"log_location": "logdog://logs.chromium.org/skia/${SWARMING_TASK_ID}/+/annotations"
},
"idempotent": true,
"io_timeout_ns": 3600000000000,
"max_attempts": 2,
"service_account": "skia-external-compile-tasks@skia-swarming-bots.iam.gserviceaccount.com"
},
"Housekeeper-PerCommit-IsolateAndroidNDKLinux": { "Housekeeper-PerCommit-IsolateAndroidNDKLinux": {
"casSpec": "empty", "casSpec": "empty",
"cipd_packages": [ "cipd_packages": [

4
infra/bots/utils.py
View File

@ -142,8 +142,8 @@ def RemoveDirectory(*path):
# Give up and use cmd.exe's rd command. # Give up and use cmd.exe's rd command.
file_path = os.path.normcase(file_path) file_path = os.path.normcase(file_path)
for _ in xrange(3): for _ in xrange(3):
print('RemoveDirectory running %s' % (' '.join() print('RemoveDirectory running %s' % (' '.join(
['cmd.exe', '/c', 'rd', '/q', '/s', file_path])) ['cmd.exe', '/c', 'rd', '/q', '/s', file_path])))
if not subprocess.call(['cmd.exe', '/c', 'rd', '/q', '/s', file_path]): if not subprocess.call(['cmd.exe', '/c', 'rd', '/q', '/s', file_path]):
break break
print(' Failed') print(' Failed')