Moving the role content into the update playbook itself, and adding a…

… conditional

obal/data/playbooks/update/metadata.obal.yaml

@@ -25,5 +25,5 @@ variables:
   changelog:
     help: Optionally set the changelog. When unspecified, an entry will be generated
   commit:
-    help: When true,  commits the update changes to it into the current branch.
+    help: When true, commits the update changes to it into the current branch
     action: store_true

obal/data/playbooks/update/update.yaml

@@ -51,9 +51,18 @@
       when:
         - "'://' not in item"
 
-- hosts:
-    - packages
-  gather_facts: false
-  roles:
-    - when: commit is defined and commit
-      role: git_branch_and_commit
+    - name: 'Get updated version from spec'
+      command: "rpmspec --query --queryformat=%{version} --srpm {{ spec_file_path }}"
+      args:
+        chdir: "{{ inventory_dir }}"
+      changed_when: false
+      register: updated_version
+      when: commit is defined and commit
+
+    - name: 'Create git commit'
+      command: "git commit -a -m 'Update {{ inventory_hostname }} to {{ updated_version.stdout }}'"
+      args:
+        chdir: "{{ inventory_dir }}"
+      run_once: true
+      changed_when: true
+      when: commit is defined and commit

tests/fixtures/help/update.txt

@@ -28,8 +28,8 @@ optional arguments:
   --changelog CHANGELOG
                         Optionally set the changelog. When unspecified, an
                         entry will be generated
-  --commit              When true, creates a commits that adds the update
-                        changes to it.
+  --commit              When true, commits the update changes to it into the
+                        current branch
   --prerelease PRERELEASE
                         Optionally set the prerelease macro. When unspecified,
                         the prerelease macro will be removed