From: David Galloway <dgallowa@redhat.com>
Date: Wed, 18 May 2022 19:14:23 +0000 (-0400)
Subject: Revert "ceph-release: Fix checkout process for HOTFIX"
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a616cb20c8c93f0442ad50a14e14878a39f10e4e;p=ceph-build.git

Revert "ceph-release: Fix checkout process for HOTFIX"

This reverts commit 25f83fd65c5ac936b5dc618ed6c553c9a2307529.
---

diff --git a/ansible/roles/ceph-release/tasks/create.yml b/ansible/roles/ceph-release/tasks/create.yml
index 0215a38c..db46e07d 100644
--- a/ansible/roles/ceph-release/tasks/create.yml
+++ b/ansible/roles/ceph-release/tasks/create.yml
@@ -37,7 +37,7 @@
   args:
     chdir: ceph
   when:
-    - "release != 'SECURITY'"
+    - "release == 'STABLE' or release == 'RELEASE_CANDIDATE'"
     - tag|bool is true
 
 - name: "git checkout previously existing tag for re-build"
@@ -45,10 +45,18 @@
   args:
     chdir: ceph
   when:
-    - "release != 'SECURITY'"
+    - "release == 'STABLE' or release == 'RELEASE_CANDIDATE'"
     - tag|bool is false
     - throwaway|bool is false
 
+# HOTFIX
+# This assumes hotfix has already been pushed to {{ branch }}-release branch on github
+- name: "git checkout {{ branch }}-release for HOTFIX release"
+  command: git checkout {{ branch }}-release
+  args:
+    chdir: ceph
+  when: "release == 'HOTFIX'"
+
 # SECURITY
 - name: "git checkout security {{ branch }}-release branch"
   command: git checkout -f -B {{ branch }}-release security/{{ branch }}-release