From 25f83fd65c5ac936b5dc618ed6c553c9a2307529 Mon Sep 17 00:00:00 2001 From: David Galloway Date: Wed, 18 May 2022 15:02:38 -0400 Subject: [PATCH] ceph-release: Fix checkout process for HOTFIX The process is the same for a STABLE release and a HOTFIX release. Signed-off-by: David Galloway --- ansible/roles/ceph-release/tasks/create.yml | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/ansible/roles/ceph-release/tasks/create.yml b/ansible/roles/ceph-release/tasks/create.yml index db46e07d..0215a38c 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 == 'STABLE' or release == 'RELEASE_CANDIDATE'" + - "release != 'SECURITY'" - tag|bool is true - name: "git checkout previously existing tag for re-build" @@ -45,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 {{ 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 -- 2.39.5