Correct kayobe branch check

Author: MoteHue

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

@@ -40,44 +40,46 @@
             dest: "{{ kayobe_temp_dir.path }}/kayobe-git"
             version: stackhpc/{{ openstack_release }}
 
+        - name: Get latest Kayobe version
+          ansible.builtin.shell:
+            cmd: set -o pipefail && grep -o kayobe@stackhpc\/.*$ {{ requirements_path }} | cut -d @ -f 2
+            executable: /usr/bin/bash
+          register: kayobe_latest_version
+
+        - name: Checkout latest Kayobe version
+          ansible.builtin.command:
+            cmd: git checkout {{ kayobe_latest_version.stdout }} 
+            chdir: "{{ kayobe_temp_dir.path }}/kayobe-git"
+
         - name: Get tag from Kayobe commit
           ansible.builtin.command:
             cmd: git describe --tags {{ kayobe_git_commit.stdout }}
             chdir: "{{ kayobe_temp_dir.path }}/kayobe-git"
           register: kayobe_current_tag
 
-        - name: Get branch from Kayobe commit
+        - name: Get version from Kayobe checkout
           ansible.builtin.command:
-            cmd: git branch --show-current {{ kayobe_git_commit.stdout }}
+            cmd: git rev-parse HEAD
             chdir: "{{ kayobe_temp_dir.path }}/kayobe-git"
-          register: kayobe_current_branch 
+          register: kayobe_current_version
 
         - name: Clean up temporary directory
           ansible.builtin.file:
             state: absent
             path: "{{ kayobe_temp_dir.path }}"
 
-        - name: Get latest Kayobe version
-          ansible.builtin.shell:
-            cmd: set -o pipefail && grep -o kayobe@stackhpc\/.*$ {{ requirements_path }} | cut -d @ -f 2
-            executable: /usr/bin/bash
-          register: kayobe_latest_version
-
         - name: Check installed Kayobe version is the latest
           ansible.builtin.assert:
-            that: >
-              kayobe_latest_version.stdout in kayobe_current_tag.stdout or
-              kayobe_latest_version.stdout in kayobe_current_branch.stdout
+            that: kayobe_git_commit.stdout in kayobe_current_version.stdout
             fail_msg: |
-              Kayobe must use the expected version before continuing. Either the
-              tag or the branch should match the expected version.
+              Kayobe must use the expected version before continuing.
 
+              Current Kayobe commit: {{ 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 }}
+              Expected Kayobe commit: {{ kayobe_git_commit.stdout }}
 
               Recreate the Kayobe environment, or install the expected version
               by running: pip install --force-reinstall -r {{ requirements_path }}
             success_msg: |
-              Kayobe running at tag: {{ kayobe_current_tag.stdout }}
-              on branch: {{ kayobe_current_branch.stdout }}
+              Kayobe running at version: {{ kayobe_current_version.stdout }}