diff --git a/jobs/build-charms/builder_launchpad.py b/jobs/build-charms/builder_launchpad.py index f4e9cc6ff..29beaaff4 100644 --- a/jobs/build-charms/builder_launchpad.py +++ b/jobs/build-charms/builder_launchpad.py @@ -54,7 +54,7 @@ def __init__(self, *args, **kwargs) -> None: self._lp_build_log_cache = {} assert self.type == "Charm", "Only supports charm builds" - assert "launchpad.net" in self._lp_bugs, "No associated with launchpad" + assert "launchpad.net" in self._lp_bugs, "Not associated with launchpad" @cached_property def _lp(self): diff --git a/jobs/sync-oci-images/sync-oci-images.groovy b/jobs/sync-oci-images/sync-oci-images.groovy index 21a2ccc26..983b95435 100644 --- a/jobs/sync-oci-images/sync-oci-images.groovy +++ b/jobs/sync-oci-images/sync-oci-images.groovy @@ -183,8 +183,8 @@ pipeline { function pull_ctr () { sudo lxc exec $LXC_NAME \ - --env HTTP_PROXY="${PROXY}" \ - --env HTTPS_PROXY="${PROXY}" \ + --env HTTP_PROXY="http://squid.internal:3128" \ + --env HTTPS_PROXY="http://squid.internal:3128" \ --env CREDS="${PULL_CREDS}" \ --env IMAGE=${1} \ -- sh -c 'ctr content fetch ${CREDS} ${IMAGE} --all-platforms > /dev/null'; @@ -213,14 +213,6 @@ pipeline { PULL_CREDS= fi - # Pull Through proxy - if echo ${i} | grep -qi -e 'nvcr.io' - then - PROXY="http://squid.internal:3128" - else - PROXY= - fi - # Pull upstream image if [ "$IS_DRY_RUN" = true ] then