Skip to content
Snippets Groups Projects
Commit 172e7625 authored by Tim Jaacks's avatar Tim Jaacks
Browse files

Improve error messages

parent f0f5a370
No related branches found
No related tags found
1 merge request!189Multiple integration pipelines
Hide whitespace changes
Inline Side-by-side
scripts/deploy_gitlab_ci.py
+ 10
− 10
View file @ 172e7625
...@@ -279,11 +279,11 @@ def main(): ...@@ -279,11 +279,11 @@ def main():
if not merged: if not merged:
sys.exit( sys.exit(
"Integration MR could not be merged. You have two possibilities to fix " "Integration MR could not be merged:\n"
"this:\n" "%s\n"
" 1. Checkout the MR and rebase it on the current master manually, or\n" "This can probably be resolved by creating a new commit in "
" 2. Delete the MR (Edit -> Delete in the MR UI)\n" "gitlab-ci and merging it. The above MR can be closed then."
"In either case restart this job afterwards in order to get it merged." % mr.web_url
) )
# ======================================================= # =======================================================
...@@ -406,11 +406,11 @@ def main(): ...@@ -406,11 +406,11 @@ def main():
if not merged: if not merged:
sys.exit( sys.exit(
"Integration MR could not be merged. You have two possibilities to fix " "Integration MR could not be merged:\n"
"this:\n" "%s\n"
" 1. Checkout the MR and rebase it on the current master manually, or\n" "This can probably be resolved by creating a new commit in "
" 2. Delete the MR (Edit -> Delete in the MR UI)\n" "gitlab-ci and merging it. The above MR can be closed then."
"In either case restart this job afterwards in order to get it merged." % mr.web_url
) )
print("Successfully merged") print("Successfully merged")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment