CI: Use template-overrides.j2 from kolla
Some kolla-ansible jobs failed due to using external mirrors instead of local ones. This was due to not using the template override provided by kolla. This patch fixes that. Depends-On: https://review.opendev.org/668226 Change-Id: I27f714fdf05e521aa8ce25c5683a452ceb35eeb8 Signed-off-by: Radosław Piliszek <radoslaw.piliszek@gmail.com>
This commit is contained in:
parent
470108a1c0
commit
20ab480ca5
@ -23,7 +23,8 @@ function check_config {
|
|||||||
-not -name kolla-build.conf \
|
-not -name kolla-build.conf \
|
||||||
-not -name passwords.yml \
|
-not -name passwords.yml \
|
||||||
-not -name passwords.yml.old \
|
-not -name passwords.yml.old \
|
||||||
-not -name sources.list)
|
-not -name sources.list \
|
||||||
|
-not -name template_overrides.j2)
|
||||||
do
|
do
|
||||||
mode=$(sudo stat -c %a $f)
|
mode=$(sudo stat -c %a $f)
|
||||||
owner=$(sudo stat -c %U:%G $f)
|
owner=$(sudo stat -c %U:%G $f)
|
||||||
|
@ -44,6 +44,12 @@
|
|||||||
- item.branch == zuul.branch
|
- item.branch == zuul.branch
|
||||||
with_items: "{{ zuul['items'] }}"
|
with_items: "{{ zuul['items'] }}"
|
||||||
|
|
||||||
|
# NOTE(yoctozepto): required to template template_overrides.j2 for Zuul
|
||||||
|
- name: Include kolla Zuul vars if building new images
|
||||||
|
include_vars:
|
||||||
|
file: "{{ zuul.executor.work_root }}/src/opendev.org/openstack/kolla/tests/vars/zuul.yml"
|
||||||
|
when: need_build_image # only then kolla sources are available (and used)
|
||||||
|
|
||||||
# NOTE(mgoddard): This only affects the remote copy of the repo, not the
|
# NOTE(mgoddard): This only affects the remote copy of the repo, not the
|
||||||
# one on the executor.
|
# one on the executor.
|
||||||
- name: checkout the previous kolla-ansible branch
|
- name: checkout the previous kolla-ansible branch
|
||||||
@ -62,6 +68,13 @@
|
|||||||
mode: 0777
|
mode: 0777
|
||||||
become: true
|
become: true
|
||||||
|
|
||||||
|
# NOTE(yoctozepto): required to customize kolla to use local mirrors
|
||||||
|
- name: Template template_overrides.j2
|
||||||
|
template:
|
||||||
|
src: "{{ zuul.executor.work_root }}/src/opendev.org/openstack/kolla/tests/templates/template_overrides.j2"
|
||||||
|
dest: /etc/kolla/template_overrides.j2
|
||||||
|
when: need_build_image # only then kolla sources are available (and used)
|
||||||
|
|
||||||
# Use the initial repo to generate config files. For upgrade jobs, this
|
# Use the initial repo to generate config files. For upgrade jobs, this
|
||||||
# repo is only available on the remote node, so use the remote-template
|
# repo is only available on the remote node, so use the remote-template
|
||||||
# role.
|
# role.
|
||||||
|
@ -57,6 +57,7 @@ profile = gate
|
|||||||
registry = 127.0.0.1:4000
|
registry = 127.0.0.1:4000
|
||||||
push = true
|
push = true
|
||||||
logs_dir = /tmp/logs/build
|
logs_dir = /tmp/logs/build
|
||||||
|
template_override = /etc/kolla/template_overrides.j2
|
||||||
|
|
||||||
[profiles]
|
[profiles]
|
||||||
gate = ${GATE_IMAGES}
|
gate = ${GATE_IMAGES}
|
||||||
|
Loading…
Reference in New Issue
Block a user