openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix periodic CI jobs"

Browse Source
This commit is contained in:
Zuul 2019-04-15 06:15:07 +00:00 committed by Gerrit Code Review
commit f45d2da5da
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/run.yml
View File

@ -18,6 +18,7 @@
kolla_ansible_src_dir: "{{ ansible_env.PWD }}/src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible" kolla_ansible_src_dir: "{{ ansible_env.PWD }}/src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible"
kolla_ansible_local_src_dir: "{{ zuul.executor.work_root }}/src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible" kolla_ansible_local_src_dir: "{{ zuul.executor.work_root }}/src/{{ zuul.project.canonical_hostname }}/openstack/kolla-ansible"
need_build_image: false need_build_image: false
build_image_tag: "change_{{ zuul.change | default('none') }}"
tasks: tasks:
# FIXME: in multi node env, api_interface may be different on each node. # FIXME: in multi node env, api_interface may be different on each node.
- name: detect api_interface_name variable - name: detect api_interface_name variable
@ -141,7 +142,7 @@
BASE_DISTRO: "{{ base_distro }}" BASE_DISTRO: "{{ base_distro }}"
INSTALL_TYPE: "{{ install_type }}" INSTALL_TYPE: "{{ install_type }}"
BUILD_IMAGE: "{{ need_build_image }}" BUILD_IMAGE: "{{ need_build_image }}"
TAG: "change_{{ zuul.change }}" TAG: "{{ build_image_tag }}"
KOLLA_SRC_DIR: "{{ ansible_env.HOME }}/src/git.openstack.org/openstack/kolla" KOLLA_SRC_DIR: "{{ ansible_env.HOME }}/src/git.openstack.org/openstack/kolla"
ACTION: "{{ scenario }}" ACTION: "{{ scenario }}"

2
tests/templates/globals-default.j2
View File

@ -23,7 +23,7 @@ openstack_service_workers: "1"
# NOTE(Jeffrey4l): use different a docker namespace name in case it pull image from hub.docker.io when deplying # NOTE(Jeffrey4l): use different a docker namespace name in case it pull image from hub.docker.io when deplying
docker_namespace: "lokolla" docker_namespace: "lokolla"
docker_registry: "{{ api_interface_address }}:4000" docker_registry: "{{ api_interface_address }}:4000"
openstack_release: "change_{{ zuul.change }}" openstack_release: "{{ build_image_tag }}"
{% else %} {% else %}
# use docker hub images # use docker hub images
docker_namespace: "kolla" docker_namespace: "kolla"