Skip to content

Commit

Permalink
Cirrus: Use cached swagger binary
Browse files Browse the repository at this point in the history
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: containers/automation_images#103

Signed-off-by: Chris Evich <[email protected]>
  • Loading branch information
cevich committed Dec 9, 2021
1 parent d6079de commit a63035b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 9 deletions.
2 changes: 1 addition & 1 deletion .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ env:
UBUNTU_NAME: "ubuntu-2110"

# Google-cloud VM Images
IMAGE_SUFFIX: "c6226133906620416"
IMAGE_SUFFIX: "c6015869890330624"
FEDORA_CACHE_IMAGE_NAME: "fedora-${IMAGE_SUFFIX}"
PRIOR_FEDORA_CACHE_IMAGE_NAME: "prior-fedora-${IMAGE_SUFFIX}"
UBUNTU_CACHE_IMAGE_NAME: "ubuntu-${IMAGE_SUFFIX}"
Expand Down
10 changes: 2 additions & 8 deletions contrib/cirrus/runner.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 &
Expand Down

0 comments on commit a63035b

Please sign in to comment.