diff options
| author | Ryan Savitski <rsavitski@google.com> | 2022-04-19 22:45:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-19 22:45:03 +0000 |
| commit | 49221ffca51dde78e578d800ee214e19a8fd53d9 (patch) | |
| tree | 0e9bed928805f9119922b6e1f29b63217cce5b32 | |
| parent | d1b4f994063525346a17064a4b6bcf9efa3baeb8 (diff) | |
| parent | 5ded6d97a35356769c6b90fa9393147b932f6c6f (diff) | |
| download | perfetto-49221ffca51dde78e578d800ee214e19a8fd53d9.tar.gz | |
Merge "CI: don't fail on missing CL owner" am: 0ce5dbae0e am: 5ded6d97a3
Original change: https://android-review.googlesource.com/c/platform/external/perfetto/+/2068289
Change-Id: I0bcf01a512d11825921a3de1ec5600415b9e3c3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | infra/ci/controller/Makefile | 4 | ||||
| -rw-r--r-- | infra/ci/frontend/Makefile | 4 | ||||
| -rw-r--r-- | infra/ci/frontend/static/script.js | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/infra/ci/controller/Makefile b/infra/ci/controller/Makefile index f72394d70..66a159bf3 100644 --- a/infra/ci/controller/Makefile +++ b/infra/ci/controller/Makefile @@ -13,11 +13,11 @@ # limitations under the License. -include $(shell python ../config.py makefile) +include $(shell python3 ../config.py makefile) test: lib/.stamp config.py common_utils.py GOOGLE_APPLICATION_CREDENTIALS=../test-credentials.json \ - dev_appserver.py app.yaml --dev_appserver_log_level ${LOGLEVEL} + python3 `which dev_appserver.py` app.yaml --dev_appserver_log_level ${LOGLEVEL} deploy: lib/.stamp config.py common_utils.py gcloud app deploy -q app.yaml queue.yaml cron.yaml \ diff --git a/infra/ci/frontend/Makefile b/infra/ci/frontend/Makefile index 400b5eb78..14a000026 100644 --- a/infra/ci/frontend/Makefile +++ b/infra/ci/frontend/Makefile @@ -13,13 +13,13 @@ # limitations under the License. -include $(shell python ../config.py makefile) +include $(shell python3 ../config.py makefile) SHASUM=shasum test: LOGLEVEL=info test: static_3p config.py common_utils.py static/config.js - dev_appserver.py app.yaml --dev_appserver_log_level ${LOGLEVEL} + python3 `which dev_appserver.py` app.yaml --dev_appserver_log_level ${LOGLEVEL} deploy: static_3p config.py common_utils.py static/config.js gcloud app deploy -q app.yaml \ diff --git a/infra/ci/frontend/static/script.js b/infra/ci/frontend/static/script.js index 152048545..18c36bf96 100644 --- a/infra/ci/frontend/static/script.js +++ b/infra/ci/frontend/static/script.js @@ -254,7 +254,7 @@ function renderCLRow(cl) { `${cl.subject}`, m('span.ps', `#${cl.psNum}`)) ), m('td', cl.status), - m('td', stripEmail(cl.owner)), + m('td', stripEmail(cl.owner || '')), m('td', getLastUpdate(cl.lastUpdate)), JOB_TYPES.map(x => renderClJobCell(`cls/${cl.num}-${cl.psNum}`, x.id)) )); |