Skip to content

Commit 6539cce

Browse files
committed
Compare commit shas in Kolla-Ansible version check
1 parent 60aa2dc commit 6539cce

File tree

1 file changed

+11
-4
lines changed

1 file changed

+11
-4
lines changed

etc/kayobe/ansible/check-kolla-ansible-version.yml

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,20 +20,27 @@
2020
chdir: "{{ lookup('ansible.builtin.env', 'KOLLA_SOURCE_PATH') }}"
2121
register: kolla_ansible_current_branch
2222

23+
- name: Get current Kolla-Ansible commit
24+
ansible.builtin.command:
25+
cmd: git rev-parse HEAD
26+
chdir: "{{ lookup('ansible.builtin.env', 'KOLLA_SOURCE_PATH') }}"
27+
register: kolla_ansible_current_commit
28+
2329
- name: Check installed Kolla-Ansible version is the expected version
2430
ansible.builtin.assert:
2531
that: >
2632
stackhpc_kolla_ansible_source_version in kolla_ansible_current_tag.stdout or
27-
stackhpc_kolla_ansible_source_version in kolla_ansible_current_branch.stdout
33+
stackhpc_kolla_ansible_source_version in kolla_ansible_current_branch.stdout or
34+
stackhpc_kolla_ansible_source_version in kolla_ansible_current_commit.stdout
2835
fail_msg: |
2936
Kolla-Ansible must use the expected version before continuing. Either the
30-
tag or the branch should match the expected version.
37+
tag, branch, or commit should match the expected version.
3138
3239
Current Kolla-Ansible tag: {{ kolla_ansible_current_tag.stdout }}
3340
Current Kolla-Ansible branch: {{ kolla_ansible_current_branch.stdout }}
41+
Current Kolla-Ansible commit: {{ kolla_ansible_current_commit.stdout }}
3442
Expected Kolla-Ansible version: {{ stackhpc_kolla_ansible_source_version }}
3543
3644
Upgrade Kolla-Ansible by running: kayobe control host upgrade
3745
success_msg: |
38-
Kolla-Ansible running at tag: {{ kolla_ansible_current_tag.stdout }}
39-
on branch: {{ kolla_ansible_current_branch.stdout }}
46+
Kolla-Ansible running at version: {{ stackhpc_kolla_ansible_source_version }}

0 commit comments

Comments
 (0)