Commit e2f6ae7b authored by Pierre Smeyers's avatar Pierre Smeyers
Browse files

Merge branch '2-error-409-conflict-resource-lock-when-deleting-pipeline' into 'main' 

Resolve "Error "409 Conflict: Resource lock" when deleting pipeline"

Closes #2

See merge request to-be-continuous/tools/gitlab-butler!27
parents c1a68078 9c13da41

gitlab_butler/butler.py

+10 −4
Original line number Diff line number Diff line
@@ -283,10 +283,16 @@ class Butler: 
                    )



        except GitlabDeleteError as e:

            # ignore "409 Conflict: Resource lock" error, pipeline will be deleted on next run

            if e.response_code != 409:

                print(

                    f"{AnsiColors.BLUE}Error:{AnsiColors.RESET} failed to delete pipeline {pipeline.id} (ref: {AnsiColors.BLUE}{pipeline.ref}{AnsiColors.RESET}) : {e}"

                )

                self.handle_error(e)

            else:

                print(

                    f"{AnsiColors.BLUE}Warning:{AnsiColors.RESET} failed to delete pipeline {pipeline.id} (ref: {AnsiColors.BLUE}{pipeline.ref}{AnsiColors.RESET}) : {e}"

                )



    # Cleanup a GitLab project

    # $1: project to be cleaned