diff options
| author | Zuul <zuul@review.opendev.org> | 2022-10-10 12:53:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2022-10-10 12:53:35 +0000 |
| commit | a8b601dc123b56a79d27a79d74b6f293b9f56240 (patch) | |
| tree | 2d0e5acc731a8c34d0caeebe5c15267e03d2a229 | |
| parent | 2d56e829aca83e94e23498bdfa0c92cae388208c (diff) | |
| parent | 35f90a31ebc5faf2ad2ecfd518fb5d80175b7d36 (diff) | |
| download | kolla-ansible-a8b601dc123b56a79d27a79d74b6f293b9f56240.tar.gz kolla-ansible-a8b601dc123b56a79d27a79d74b6f293b9f56240.zip | |
Merge "CI: Fix init-swift"
| -rw-r--r-- | tests/run.yml | 7 | ||||
| -rw-r--r-- | zuul.d/jobs.yaml | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/tests/run.yml b/tests/run.yml index bc0163591..43d37184d 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 aaba19303..4ab628749 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 |