Support branches in version checks

Author: MoteHue

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

@@ -44,7 +44,13 @@
           ansible.builtin.command:
             cmd: git describe --tags {{ kayobe_git_commit.stdout }}
             chdir: "{{ kayobe_temp_dir.path }}/kayobe-git"
-          register: kayobe_current_version
+          register: kayobe_current_tag
+
+        - name: Get branch from Kayobe commit
+          ansible.builtin.command:
+            cmd: git branch --show-current {{ kayobe_git_commit.stdout }}
+            chdir: "{{ kayobe_temp_dir.path }}/kayobe-git"
+          register: kayobe_current_branch 
 
         - name: Clean up temporary directory
           ansible.builtin.file:
@@ -59,14 +65,19 @@
 
         - name: Check installed Kayobe version is the latest
           ansible.builtin.assert:
-            that: "kayobe_latest_version.stdout in kayobe_current_version.stdout"
+            that: >
+              kayobe_latest_version.stdout in kayobe_current_tag.stdout or
+              kayobe_latest_version.stdout in kayobe_current_branch.stdout
             fail_msg: |
-              Kayobe must use the expected version before continuing.
+              Kayobe must use the expected version before continuing. Either the
+              tag or the branch should match the expected version
 
-              Current Kayobe version: {{ kayobe_current_version.stdout }}
+              Current Kayobe tag: {{ kayobe_current_tag.stdout }}
+              Current Kayobe branch: {{ kayobe_current_branch.stdout }}
               Expected Kayobe version: {{ kayobe_latest_version.stdout }}
 
               Recreate the Kayobe environment, or install the expected version
               by running: pip install --force-reinstall -r {{ requirements_path }}
             success_msg: |
-              Kayobe running at version: {{ kayobe_current_version.stdout }}
+              Kayobe running at tag: {{ kayobe_current_tag.stdout }}
+              on branch: {{ kayobe_current_branch.stdout }}

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

@@ -12,17 +12,28 @@
           ansible.builtin.command:
             cmd: git describe --tags
             chdir: "{{ lookup('ansible.builtin.env', 'KOLLA_SOURCE_PATH') }}"
-          register: kolla_ansible_current_version
+          register: kolla_ansible_current_tag
+
+        - name: Get current Kolla-Ansible branch
+          ansible.builtin.command:
+            cmd: git branch --show-current
+            chdir: "{{ lookup('ansible.builtin.env', 'KOLLA_SOURCE_PATH') }}"
+          register: kolla_ansible_current_branch
 
         - name: Check installed Kolla-Ansible version is the expected version
           ansible.builtin.assert:
-            that: "stackhpc_kolla_ansible_source_version in kolla_ansible_current_version.stdout"
+            that: >
+              stackhpc_kolla_ansible_source_version in kolla_ansible_current_tag.stdout or
+              stackhpc_kolla_ansible_source_version in kolla_ansible_current_branch.stdout
             fail_msg: |
-              Kolla-Ansible must use the expected version before continuing.
+              Kolla-Ansible must use the expected version before continuing. Either the
+              tag or the branch should match the expected version.
 
-              Current Kolla-Ansible version: {{ kolla_ansible_current_version.stdout }}
+              Current Kolla-Ansible version: {{ kolla_ansible_current_tag.stdout }}
+              Current Kolla-Ansible branch: {{ kolla_ansible_current_branch.stdout }}
               Expected Kolla-Ansible version: {{ stackhpc_kolla_ansible_source_version }}
 
               Upgrade Kolla-Ansible by running: kayobe control host upgrade
             success_msg: |
-              Kolla-Ansible running at version: {{ kolla_ansible_current_version.stdout }}
+              Kolla-Ansible running at tag: {{ kolla_ansible_current_tag.stdout }}
+              on branch: {{ kolla_ansible_current_branch.stdout }}