Merge "CI: remove android-arm-asan bot" into main
diff --git a/infra/ci/config.py b/infra/ci/config.py
index 0f0f068..c306457 100755
--- a/infra/ci/config.py
+++ b/infra/ci/config.py
@@ -98,11 +98,6 @@
'PERFETTO_TEST_SCRIPT':
'test/ci/android_tests.sh',
},
- 'android-clang-arm-asan': {
- 'PERFETTO_TEST_GN_ARGS': 'is_debug=false target_os="android" '
- 'target_cpu="arm" is_asan=true',
- 'PERFETTO_TEST_SCRIPT': 'test/ci/android_tests.sh',
- },
'linux-clang-x86_64-libfuzzer': {
'PERFETTO_TEST_GN_ARGS': 'is_debug=false is_fuzzer=true is_asan=true',
'PERFETTO_TEST_SCRIPT': 'test/ci/fuzzer_tests.sh',
diff --git a/infra/ci/controller/Makefile b/infra/ci/controller/Makefile
index 42e6194..337d72e 100644
--- a/infra/ci/controller/Makefile
+++ b/infra/ci/controller/Makefile
@@ -31,7 +31,7 @@
--project ${PROJECT} -v ${GAE_VERSION} -s default -q
lib/.stamp:
- echo "If this fails run `sudo apt install python-pip`"
+ echo "If this fails run sudo apt install python-pip"
python2.7 -m pip install -t lib/ rsa==4.0 oauth2client==4.1.3 httplib2==0.20.4
touch $@
diff --git a/infra/ci/frontend/static/script.js b/infra/ci/frontend/static/script.js
index 207cc83..a2e9dc6 100644
--- a/infra/ci/frontend/static/script.js
+++ b/infra/ci/frontend/static/script.js
@@ -28,7 +28,6 @@
{ id: 'linux-clang-x86_64-bazel', label: 'bazel' },
{ id: 'ui-clang-x86_64-release', label: 'rel' },
{ id: 'android-clang-arm-release', label: 'rel' },
- { id: 'android-clang-arm-asan', label: 'asan' },
];
const STATS_LINK =
@@ -193,7 +192,7 @@
m('td[rowspan=4]', 'Status'),
m('td[rowspan=4]', 'Owner'),
m('td[rowspan=4]', 'Updated'),
- m('td[colspan=11]', 'Bots'),
+ m('td[colspan=10]', 'Bots'),
),
m('tr',
m('td[colspan=9]', 'linux'),
@@ -203,7 +202,7 @@
m('td', 'gcc7'),
m('td[colspan=7]', 'clang'),
m('td[colspan=1]', 'ui'),
- m('td[colspan=2]', 'clang-arm'),
+ m('td[colspan=1]', 'clang-arm'),
),
m('tr#cls_header',
JOB_TYPES.map(job => m(`td#${job.id}`, job.label))
