diff options
| author | Ryan Savitski <rsavitski@google.com> | 2022-04-19 22:04:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-04-19 22:04:35 +0000 |
| commit | 0ce5dbae0e6d544b658260505993f18be323bcb8 (patch) | |
| tree | 0e9bed928805f9119922b6e1f29b63217cce5b32 | |
| parent | 64a2404ff0c655397649f4e08468ea7cd1fd4fff (diff) | |
| parent | 022601d4bc52a0951769f9215267f97b29763531 (diff) | |
| download | perfetto-0ce5dbae0e6d544b658260505993f18be323bcb8.tar.gz | |
Merge "CI: don't fail on missing CL owner"
| -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)) )); |