Merge "Fix periodic CI jobs"

tests/run.yml

@@ -18,6 +18,7 @@
     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"
     need_build_image: false
+    build_image_tag: "change_{{ zuul.change | default('none') }}"
   tasks:
     # FIXME: in multi node env, api_interface may be different on each node.
     - name: detect api_interface_name variable
@@ -141,7 +142,7 @@
         BASE_DISTRO: "{{ base_distro }}"
         INSTALL_TYPE: "{{ install_type }}"
         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"
         ACTION: "{{ scenario }}"
 

tests/templates/globals-default.j2

@@ -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
 docker_namespace: "lokolla"
 docker_registry: "{{ api_interface_address }}:4000"
-openstack_release: "change_{{ zuul.change }}"
+openstack_release: "{{ build_image_tag }}"
 {% else %}
 # use docker hub images
 docker_namespace: "kolla"