From accb5cde98bd9380dc72cc819f9e2c2cf5e472dd Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 18 May 2022 15:16:34 -0400 Subject: [PATCH] ceph-setup: Pull {{branch}}-release not {{branch}} for hotfix Signed-off-by: David Galloway --- ansible/roles/ceph-release/tasks/create.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ansible/roles/ceph-release/tasks/create.yml b/ansible/roles/ceph-release/tasks/create.yml index db46e07d..1d6203ff 100644 --- a/ansible/roles/ceph-release/tasks/create.yml +++ b/ansible/roles/ceph-release/tasks/create.yml @@ -32,6 +32,7 @@ # 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 }} args: @@ -52,7 +53,7 @@ # 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 + command: git checkout -f -B {{ branch }}-release upstream/{{ branch }}-release args: chdir: ceph when: "release == 'HOTFIX'" -- 2.39.5