From 35f90a31ebc5faf2ad2ecfd518fb5d80175b7d36 Mon Sep 17 00:00:00 2001
From: Michal Nasiadka <mnasiadka@gmail.com>
Date: Wed, 21 Sep 2022 12:29:23 +0200
Subject: [PATCH] CI: Fix init-swift
Container image naming scheme has changed
Change-Id: I775ea3f796290c670e4b04640f4429304dae609c
---
tests/run.yml | 7 ++++---
zuul.d/jobs.yaml | 6 ++++++
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/tests/run.yml b/tests/run.yml
index bc01635911..43d37184dd 100644
--- a/tests/run.yml
+++ b/tests/run.yml
@@ -287,11 +287,12 @@
shell:
cmd: "{{ kolla_ansible_venv_path }}/bin/ansible all -i {{ kolla_inventory_path }} -m setup > /tmp/logs/ansible/initial-setup"
- - name: Set facts for actions
+ - name: Set facts for Swift initialisation
set_fact:
# NOTE(yoctozepto): no support for upgrades for now
- docker_image_tag: "{{ build_image_tag if need_build_image else (zuul.branch | basename) ~ docker_image_tag_suffix }}"
+ docker_image_tag: "{{ build_image_tag if need_build_image else (zuul.branch | basename) ~ '-' ~ base_distro ~ '-' ~ base_distro_version ~ docker_image_tag_suffix }}"
docker_image_prefix: "{{ 'primary:4000/lokolla/' if need_build_image else '{{ zuul_site_mirror_fqdn }}:4447/openstack.kolla/' }}"
+ when: scenario in ['swift']
# NOTE(yoctozepto): k-a octavia-certificates should run before k-a bootstrap-servers
# because the latter hijacks /etc/kolla permissions (due to same directory on the
@@ -327,7 +328,7 @@
executable: /bin/bash
chdir: "{{ kolla_ansible_src_dir }}"
environment:
- KOLLA_SWIFT_BASE_IMAGE: "{{ docker_image_prefix }}{{ base_distro }}-swift-base:{{ docker_image_tag }}"
+ KOLLA_SWIFT_BASE_IMAGE: "{{ docker_image_prefix }}swift-base:{{ docker_image_tag }}"
# NOTE(yoctozepto): no IPv6 for now
STORAGE_NODES: "{{ groups['all'] | map('extract', hostvars,
['ansible_'+api_interface_name, 'ipv4', 'address'])
diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml
index aaba193036..4ab628749c 100644
--- a/zuul.d/jobs.yaml
+++ b/zuul.d/jobs.yaml
@@ -241,6 +241,9 @@
nodeset: kolla-ansible-rocky9-multi
vars:
base_distro: rocky
+ # NOTE(yoctozepto): We need this here because we initialise Swift outside
+ # of Kolla Ansible and need to know the version of images.
+ base_distro_version: 9
- job:
name: kolla-ansible-ubuntu-source-swift
@@ -248,6 +251,9 @@
nodeset: kolla-ansible-jammy-multi
vars:
base_distro: ubuntu
+ # NOTE(yoctozepto): We need this here because we initialise Swift outside
+ # of Kolla Ansible and need to know the version of images.
+ base_distro_version: jammy
- job:
name: kolla-ansible-rocky9-source-swift-upgrade