Skip to content

Commit 952ae20

Browse files
authored
[ci] Upload hailctl artifacts after building the release mode jar/wheel (#14832)
This allows the test-dataproc steps to use these artifacts. ## Security Assessment Delete all except the correct answer: - This change has no security impact ### Impact Description Minor change to build steps.
1 parent 8f8c9f6 commit 952ae20

File tree

2 files changed

+41
-7
lines changed

2 files changed

+41
-7
lines changed

build.yaml

Lines changed: 39 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,7 @@ steps:
721721
sleep 5
722722
fi
723723
724-
time retry make wheel
724+
time retry make DEV_CLARIFIER=hail-ci-build wheel
725725
726726
# Check wheel size is small enough for pypi (< 200 MiB)
727727
BYTES=$(du build/deploy/dist/hail-*-py3-none-any.whl | awk '{print $1}')
@@ -737,6 +737,40 @@ steps:
737737
dependsOn:
738738
- base_image
739739
- merge_code
740+
- kind: runImage
741+
name: upload_temporary_hailctl_artifacts
742+
image:
743+
valueFrom: ci_utils_image.image
744+
resources:
745+
memory: standard
746+
cpu: '1'
747+
script: |
748+
set -ex
749+
cd /io/repo/hail
750+
751+
gcloud auth activate-service-account --key-file=/test-dataproc-service-account-key/test-dataproc-service-account-key.json
752+
make HAIL_RELEASE_MODE=1 DEV_CLARIFIER=hail-ci-build upload-artifacts \
753+
-o $(ls build/deploy/dist/hail-*-py3-none-any.whl)
754+
dependsOn:
755+
- ci_utils_image
756+
- default_ns
757+
- merge_code
758+
- build_hail_jar_and_wheel
759+
inputs:
760+
- from: /repo
761+
to: /io/repo
762+
- from: /derived/release/hail/build/deploy/dist
763+
to: /io/repo/hail/build/deploy/dist
764+
secrets:
765+
- name: test-dataproc-service-account-key
766+
namespace:
767+
valueFrom: default_ns.name
768+
mountPath: /test-dataproc-service-account-key
769+
scopes:
770+
- deploy
771+
- dev
772+
clouds:
773+
- gcp
740774
- kind: runImage
741775
name: build_hail_debug_jar_and_wheel
742776
image:
@@ -3285,13 +3319,13 @@ steps:
32853319
fi
32863320
32873321
cd hail
3288-
make test-dataproc-37 DEV_CLARIFIER=ci_test_dataproc-37 HAIL_RELEASE_MODE=1 \
3322+
make test-dataproc-37 HAIL_RELEASE_MODE=1 \
32893323
-o $(ls build/deploy/dist/hail-*-py3-none-any.whl)
32903324
dependsOn:
32913325
- ci_utils_image
32923326
- default_ns
32933327
- merge_code
3294-
- build_hail_jar_and_wheel
3328+
- upload_temporary_hailctl_artifacts
32953329
inputs:
32963330
- from: /repo
32973331
to: /io/repo
@@ -3329,13 +3363,13 @@ steps:
33293363
fi
33303364
33313365
cd hail
3332-
make test-dataproc-38 DEV_CLARIFIER=ci_test_dataproc-38 HAIL_RELEASE_MODE=1 \
3366+
make test-dataproc-38 HAIL_RELEASE_MODE=1 \
33333367
-o $(ls build/deploy/dist/hail-*-py3-none-any.whl)
33343368
dependsOn:
33353369
- ci_utils_image
33363370
- default_ns
33373371
- merge_code
3338-
- build_hail_jar_and_wheel
3372+
- upload_temporary_hailctl_artifacts
33393373
inputs:
33403374
- from: /repo
33413375
to: /io/repo

hail/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -405,11 +405,11 @@ install-on-cluster: $(WHEEL) check-pip-lockfile
405405
install-hailctl: install upload-artifacts
406406

407407
.PHONY: test-dataproc-37
408-
test-dataproc-37: install-hailctl
408+
test-dataproc-37: install
409409
bash scripts/test-dataproc.sh "GRCh37"
410410

411411
.PHONY: test-dataproc-38
412-
test-dataproc-38: install-hailctl
412+
test-dataproc-38: install
413413
bash scripts/test-dataproc.sh "GRCh38"
414414

415415
# install skopeo

0 commit comments

Comments
 (0)