Skip to content

Commit c9fc5cf

Browse files
[ci] Consolidate check services steps (#12373)
1 parent ec903ed commit c9fc5cf

File tree

2 files changed

+4
-23
lines changed

2 files changed

+4
-23
lines changed

Makefile

+4-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ check-hail:
1414

1515
.PHONY: check-services
1616
check-services: check-auth check-batch check-ci check-gear check-memory \
17-
check-notebook check-web-common check-website
17+
check-notebook check-monitoring check-web-common check-website
1818

1919
.PHONY: check-auth
2020
check-auth:
@@ -40,6 +40,9 @@ check-memory:
4040
check-notebook:
4141
$(MAKE) -C notebook check
4242

43+
.PHONY: check-monitoring
44+
$(MAKE) -C monitoring check
45+
4346
.PHONY: check-web-common
4447
check-web-common:
4548
$(MAKE) -C web_common check

build.yaml

-22
Original file line numberDiff line numberDiff line change
@@ -1120,17 +1120,6 @@ steps:
11201120
- hail_ubuntu_image
11211121
- render_notebook_nginx_conf
11221122
- merge_code
1123-
- kind: runImage
1124-
name: check_notebook
1125-
image:
1126-
valueFrom: notebook_image.image
1127-
script: |
1128-
set -ex
1129-
SITE_PACKAGES=$(pip3 show notebook | grep Location | sed 's/Location: //')
1130-
python3 -m flake8 $SITE_PACKAGES/notebook
1131-
python3 -m pylint --rcfile pylintrc notebook
1132-
dependsOn:
1133-
- notebook_image
11341123
- kind: runImage
11351124
name: test_hail_python
11361125
numSplits: 7
@@ -1523,17 +1512,6 @@ steps:
15231512
- create_dummy_oauth2_client_secret
15241513
- create_certs
15251514
- create_accounts
1526-
- kind: runImage
1527-
name: check_monitoring
1528-
image:
1529-
valueFrom: monitoring_image.image
1530-
script: |
1531-
set -ex
1532-
SITE_PACKAGES=$(pip3 show monitoring | grep Location | sed 's/Location: //')
1533-
python3 -m flake8 $SITE_PACKAGES/monitoring
1534-
python3 -m pylint --rcfile pylintrc monitoring
1535-
dependsOn:
1536-
- monitoring_image
15371515
- kind: runImage
15381516
name: delete_monitoring_tables
15391517
image:

0 commit comments

Comments
 (0)