From e380cdd226bd702277c644c61f76fb97d1c9b1e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Tue, 12 Apr 2022 22:03:22 +0200 Subject: [PATCH] [CI] Remove reliance on install_type With the install_type going away and actually removed from job definitions, we have to stop relying on it - to fix otherwise broken jobs (swift and when doing kolla builds with k-a). Change-Id: If13c4e276d3eec29a552ed229af95f5cf016100c --- tests/run.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/run.yml b/tests/run.yml index 107c8bd2d5..2db5123e58 100644 --- a/tests/run.yml +++ b/tests/run.yml @@ -58,7 +58,6 @@ # buster see https://github.com/docker/for-linux/issues/711. push: "{{ base_distro != 'debian' }}" base: "{{ base_distro }}" - install_type: "{{ install_type }}" registry: "127.0.0.1:4000" namespace: lokolla tag: "{{ build_image_tag }}" @@ -334,7 +333,8 @@ executable: /bin/bash chdir: "{{ kolla_ansible_src_dir }}" environment: - KOLLA_SWIFT_BASE_IMAGE: "{{ docker_image_prefix }}{{ base_distro }}-{{ install_type }}-swift-base:{{ docker_image_tag }}" + # TODO(yoctozepto): Remove hardcoded "source" when Kolla omits this part. + KOLLA_SWIFT_BASE_IMAGE: "{{ docker_image_prefix }}{{ base_distro }}-source-swift-base:{{ docker_image_tag }}" # NOTE(yoctozepto): no IPv6 for now STORAGE_NODES: "{{ groups['all'] | map('extract', hostvars, ['ansible_'+api_interface_name, 'ipv4', 'address'])