Skip to content

Commit

Permalink
[ci] hail_curl_image is redundant. kill it. (#14490)
Browse files Browse the repository at this point in the history
`curl` is already installed in `hail_ubuntu_image`, on which
`curl_image` is based.
  • Loading branch information
ehigham authored Apr 22, 2024
1 parent 274235d commit 1e04f11
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 13 deletions.
14 changes: 2 additions & 12 deletions build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2655,16 +2655,6 @@ steps:
WORKDIR ["/work"]
dependsOn:
- hail_ubuntu_image
- kind: buildImage2
name: curl_image
publishAs: curl
dockerFile:
inline: |
ARG BASE_IMAGE={{ hail_ubuntu_image.image }}
FROM $BASE_IMAGE
RUN hail-apt-get-install curl
dependsOn:
- hail_ubuntu_image
- kind: runImage
name: test_batch
numSplits: 5
Expand All @@ -2682,7 +2672,7 @@ steps:
export HAIL_GSA_KEY_FILE=/test-gsa-key/key.json
export CI_UTILS_IMAGE={{ ci_utils_image.image }}
export HAIL_CURL_IMAGE={{ curl_image.image }}
export HAIL_CURL_IMAGE={{ hail_ubuntu_image.image }}
export HAIL_DEFAULT_NAMESPACE={{ default_ns.name }}
export HAIL_NETCAT_UBUNTU_IMAGE={{ netcat_ubuntu_image.image }}
export HAIL_VOLUME_IMAGE={{ volume_image.image }}
Expand Down Expand Up @@ -2741,7 +2731,7 @@ steps:
- netcat_ubuntu_image
- volume_image
- workdir_image
- curl_image
- hail_ubuntu_image
- gpu_image
- kind: runImage
name: delete_test_billing_projects
Expand Down
1 change: 0 additions & 1 deletion infra/gcp-broad/gcp-ar-cleanup-policy.txt
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,6 @@
"ci-hello",
"ci-utils",
"create_certs_image",
"curl",
"git-make-bash",
"gpu",
"hail-benchmark",
Expand Down

0 comments on commit 1e04f11

Please sign in to comment.