From a63035be203254b979e56bb77e7cf48646e9962b Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Wed, 8 Dec 2021 10:46:26 -0500 Subject: Cirrus: Use cached swagger binary An error was observed in another PR while downloading the swagger binary. The error was relating to the upstream egress quota. Obviously our downloading it every time for each CI run isn't helping. Fix this by moving the download into the image-build process, and simply re-use the already present binary here. Ref: https://github.com/containers/automation_images/pull/103 Signed-off-by: Chris Evich --- contrib/cirrus/runner.sh | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'contrib/cirrus') diff --git a/contrib/cirrus/runner.sh b/contrib/cirrus/runner.sh index 2c961da06..c52fd9216 100755 --- a/contrib/cirrus/runner.sh +++ b/contrib/cirrus/runner.sh @@ -141,11 +141,8 @@ function _run_swagger() { local envvarsfile req_env_vars GCPJSON GCPNAME GCPPROJECT CTR_FQIN - # Building this is a PITA, just grab binary for use in automation - # Ref: https://goswagger.io/install.html#static-binary - download_url=$(\ - curl -s https://api.github.com/repos/go-swagger/go-swagger/releases/latest | \ - jq -r '.assets[] | select(.name | contains("linux_amd64")) | .browser_download_url') + [[ -x /usr/local/bin/swagger ]] || \ + die "Expecting swagger binary to be present and executable." # The filename and bucket depend on the automation context #shellcheck disable=SC2154,SC2153 @@ -166,9 +163,6 @@ function _run_swagger() { die "Unknown execution context, expected a non-empty value for \$CIRRUS_TAG, \$CIRRUS_BRANCH, or \$CIRRUS_PR" fi - curl -s -o /usr/local/bin/swagger -L'#' "$download_url" - chmod +x /usr/local/bin/swagger - # Swagger validation takes a significant amount of time msg "Pulling \$CTR_FQIN '$CTR_FQIN' (background process)" podman pull --quiet $CTR_FQIN & -- cgit v1.2.3-54-g00ecf