ceph-setup: Check out {{ branch }}-release

We *do* want to do this after all. It's sketchy to expect {{ branch }} will continue staying at the point you want it to.

Yuri (or anyone) should push {{ branch }} to {{ branch }}-release and test it.  {{ branch }} can continue to be merged to.

Signed-off-by: David Galloway <dgallowa@redhat.com>

diff --git a/ansible/roles/ceph-release/tasks/create.yml b/ansible/roles/ceph-release/tasks/create.yml
index a127feeea9d5b1c66a1c50b84f535923100b97d7..5969a7b1dacb46f8de78a476481c574312c68116 100644 (file)
--- a/ansible/roles/ceph-release/tasks/create.yml
+++ b/ansible/roles/ceph-release/tasks/create.yml
@@ -30,15 +30,14 @@
   args:
     chdir: ceph
 
-# REGULAR / RC
-# This assumes {{ branch }} is at the point where release is desired
-# Human push to {{ branch }}-release is not necessary but won't break anything
-- name: "git checkout and reset {{ branch }}-release to {{ branch }} for REGULAR or RC release"
-  command: git checkout -f -B {{ branch }}-release upstream/{{ branch }}
+# REGULAR / RC / HOTFIX
+# This assumes {{ branch }} has been pushed to {{ branch }}-release and is ready to be built
+- name: "git checkout {{ branch }}-release for non-SECURITY release"
+  command: git checkout -f -B {{ branch }}-release upstream/{{ branch }}-release
   args:
     chdir: ceph
   when:
-    - "release == 'STABLE' or release == 'RELEASE_CANDIDATE'"
+    - "release != 'SECURITY'"
     - tag|bool is true
 
 - name: "git checkout previously existing tag for re-build"
@@ -46,18 +45,10 @@
   args:
     chdir: ceph
   when:
-    - "release == 'STABLE' or release == 'RELEASE_CANDIDATE'"
+    - "release != 'SECURITY'"
     - 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 -f -B {{ branch }}-release upstream/{{ 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