diff --git a/roles/airshipctl-build-images/tasks/main.yaml b/roles/airshipctl-build-images/tasks/main.yaml index 65b5b6a73..7e79308b5 100644 --- a/roles/airshipctl-build-images/tasks/main.yaml +++ b/roles/airshipctl-build-images/tasks/main.yaml @@ -14,6 +14,10 @@ make: chdir: "{{ zuul.project.src_dir }}" target: images + params: + PROXY: "{{ proxy.http }}" + NO_PROXY: "{{ proxy.noproxy }}" + USE_PROXY: "{{ proxy.enabled | lower }}" - name: Verify Image Exists shell: docker image inspect "$(make print-docker-image-tag)" diff --git a/roles/airshipctl-publish-images/tasks/main.yaml b/roles/airshipctl-publish-images/tasks/main.yaml index 7bd6565ce..dba60ddac 100644 --- a/roles/airshipctl-publish-images/tasks/main.yaml +++ b/roles/airshipctl-publish-images/tasks/main.yaml @@ -34,6 +34,10 @@ params: DOCKER_IMAGE_TAG: latest PUBLISH: "true" + PROXY: "{{ proxy.http }}" + NO_PROXY: "{{ proxy.noproxy }}" + USE_PROXY: "{{ proxy.enabled | lower }}" + DOCKER_REGISTRY: "{{ image_repo }}" target: images - name: Push Image with Commit Tag @@ -42,4 +46,8 @@ params: DOCKER_IMAGE_TAG: "{{ zuul.newrev }}" PUBLISH: "true" + PROXY: "{{ proxy.http }}" + NO_PROXY: "{{ proxy.noproxy }}" + USE_PROXY: "{{ proxy.enabled | lower }}" + DOCKER_REGISTRY: "{{ image_repo }}" target: images diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 150687b77..3881af482 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -198,4 +198,3 @@ pass-to-parent: true vars: image: quay.io/airshipit/airshipctl - image_repo: https://quay.io/api/v1/ diff --git a/zuul.d/projects.yaml b/zuul.d/projects.yaml index 42a3f0317..239892f3e 100644 --- a/zuul.d/projects.yaml +++ b/zuul.d/projects.yaml @@ -13,6 +13,12 @@ - project: vars: sphinx_build_dir: docs/build + proxy: + enabled: false + http: "" + https: "" + noproxy: "" + image_repo: https://quay.io/api/v1/ check: jobs: - openstack-tox-docs: &docs