Browse Source

Merge "CI: use wheels from infra mirror" into stable/train

changes/67/737067/1
Zuul 3 weeks ago
committed by Gerrit Code Review
parent
commit
1369700334
2 changed files with 4 additions and 0 deletions
  1. +1
    -0
      tests/templates/template_overrides.j2
  2. +3
    -0
      tests/vars/zuul.yml

+ 1
- 0
tests/templates/template_overrides.j2 View File

@@ -6,6 +6,7 @@

ENV PIP_INDEX_URL {{ nodepool_pypi_mirror }}
ENV PIP_TRUSTED_HOST {{ nodepool_mirror_host }}
ENV PIP_EXTRA_INDEX_URL {{ nodepool_wheel_mirror }}

RUN echo registry={{ nodepool_npmjs_proxy }} > /etc/npmrc \
&& mkdir -p /usr/etc \


+ 3
- 0
tests/vars/zuul.yml View File

@@ -5,3 +5,6 @@ nodepool_mirror_host: "{{ zuul_site_mirror_fqdn }}"
nodepool_npmjs_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/registry.npmjs/"
nodepool_cbs_centos_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/cbs.centos"
nodepool_docker_proxy: "http://{{ zuul_site_mirror_fqdn }}:8080/docker"

# NOTE(hrw): wheel cache goes over 80/443 not on 8080
nodepool_wheel_mirror: "https://{{ zuul_site_mirror_fqdn }}/wheel/{{ ansible_distribution | lower }}-{{ ansible_distribution_version }}-{{ ansible_architecture | lower }}"

Loading…
Cancel
Save