Skip to content
Snippets Groups Projects
Commit 717f4d9f authored by Bartosz Bezak's avatar Bartosz Bezak
Browse files

set previous_release to zed

Upgrade CI job needs clouds.yaml to be used from Zed

Newer version of ansible-collections-openstack uses different return
value. [1]

[1] https://review.opendev.org/c/openstack/ansible-collections-openstack/+/841224

Change-Id: Ic0608bc6033025cb47655d601ffaf3744637832f
parent 0c11102a
No related branches found
No related tags found
No related merge requests found
...@@ -88,13 +88,13 @@ ...@@ -88,13 +88,13 @@
extension: "{{ item.created_at | replace(':', '-') }}~" extension: "{{ item.created_at | replace(':', '-') }}~"
with_items: with_items:
- name: "{{ ipa_images_kernel_name }}" - name: "{{ ipa_images_kernel_name }}"
created_at: "{{ ipa_images_kernel.openstack_image.created_at | default }}" created_at: "{{ ipa_images_kernel.openstack_images[0].created_at | default }}"
checksum: "{{ ipa_images_checksum.results[0].stat.checksum }}" checksum: "{{ ipa_images_checksum.results[0].stat.checksum }}"
glance_checksum: "{{ ipa_images_kernel.openstack_image.checksum | default }}" glance_checksum: "{{ ipa_images_kernel.openstack_images[0].checksum | default }}"
- name: "{{ ipa_images_ramdisk_name }}" - name: "{{ ipa_images_ramdisk_name }}"
created_at: "{{ ipa_images_ramdisk.openstack_image.created_at | default }}" created_at: "{{ ipa_images_ramdisk.openstack_images[0].created_at | default }}"
checksum: "{{ ipa_images_checksum.results[1].stat.checksum }}" checksum: "{{ ipa_images_checksum.results[1].stat.checksum }}"
glance_checksum: "{{ ipa_images_ramdisk.openstack_image.checksum | default }}" glance_checksum: "{{ ipa_images_ramdisk.openstack_images[0].checksum | default }}"
when: when:
- item.glance_checksum - item.glance_checksum
- item.checksum != item.glance_checksum - item.checksum != item.glance_checksum
......
...@@ -14,11 +14,11 @@ ...@@ -14,11 +14,11 @@
- name: Set fact containing kernel uuid - name: Set fact containing kernel uuid
set_fact: set_fact:
ipa_images_kernel_uuid: "{{ ipa_images_glance.results[0].openstack_image.id }}" ipa_images_kernel_uuid: "{{ ipa_images_glance.results[0].openstack_images[0].id }}"
- name: Set fact containing ramdisk uuid - name: Set fact containing ramdisk uuid
set_fact: set_fact:
ipa_images_ramdisk_uuid: "{{ ipa_images_glance.results[1].openstack_image.id }}" ipa_images_ramdisk_uuid: "{{ ipa_images_glance.results[1].openstack_images[0].id }}"
- name: Get a list of ironic nodes - name: Get a list of ironic nodes
command: | command: |
......
...@@ -45,6 +45,7 @@ ...@@ -45,6 +45,7 @@
- etc/kayobe/kolla/passwords.yml - etc/kayobe/kolla/passwords.yml
- etc/kolla/admin-openrc.sh - etc/kolla/admin-openrc.sh
- etc/kolla/public-openrc.sh - etc/kolla/public-openrc.sh
- etc/kolla/clouds.yaml
# NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes # NOTE(mgoddard): Use the name zz-overrides.yml to ensure this takes
# precedence over the standard config files. # precedence over the standard config files.
......
...@@ -87,7 +87,7 @@ ...@@ -87,7 +87,7 @@
- ^zuul.d/.* - ^zuul.d/.*
vars: vars:
# Name of the release to upgrade from for upgrade jobs. # Name of the release to upgrade from for upgrade jobs.
previous_release: yoga previous_release: zed
logs_dir: "/tmp/logs" logs_dir: "/tmp/logs"
ansible_collection_kolla_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/ansible-collection-kolla'].src_dir }}" ansible_collection_kolla_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/ansible-collection-kolla'].src_dir }}"
kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kayobe'].src_dir }}" kayobe_src_dir: "{{ ansible_env.PWD ~ '/' ~ zuul.projects['opendev.org/openstack/kayobe'].src_dir }}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment