Skip to content
Snippets Groups Projects
Commit 1a2268f0 authored by Walter Lozano's avatar Walter Lozano
Browse files

Rename create-mr-pipeline-true function


Rename function create-mr-pipeline-true to merge-mr to avoid confusions.

Signed-off-by: default avatarWalter Lozano <walter.lozano@collabora.com>
parent 371c1c13
No related branches found
No related tags found
1 merge request!188Improvements to folding pipeline
......@@ -164,7 +164,7 @@ function fold_and_clean ()
sleep 10
echo "Set merge_if_pipeline_succeeds for Merge Request $MR_ID for project pkg/$pkg"
create-mr-pipeline-true "pkg/$pkg" $MR_ID || (sleep 3; trigger-mr-pipeline "pkg/$pkg" $MR_ID)
merge-mr "pkg/$pkg" $MR_ID || (sleep 3; trigger-mr-pipeline "pkg/$pkg" $MR_ID)
echo
echo MERGE $pkg $MR_URL >> $base_release-$branch-$comp.log
else
......
......@@ -32,13 +32,6 @@ create-merge-request(){
request=POST api /projects/$repoid/merge_requests -d source_branch=$2 -d target_branch=$3 -d title="Merge changes from $2 into $3"
}
create-mr-pipeline-true(){
repoid=$(get-id $1)
mr_id=$2
request=PUT api /projects/$repoid/merge_requests/$mr_id/merge -d merge_commit_message="Auto merge changes for this MR, if the pipeline succeeds" -d merge_when_pipeline_succeeds="true" -d should_remove_source_branch="true"
}
create-repo-branch(){
repoid=$(get-id $1)
......@@ -111,6 +104,13 @@ get-repo-triggers(){
api /projects/$repoid/triggers | jq -r '.[] | [.token] | @tsv'
}
merge-mr(){
repoid=$(get-id $1)
mr_id=$2
request=PUT api /projects/$repoid/merge_requests/$mr_id/merge -d merge_commit_message="Auto merge changes for this MR, if the pipeline succeeds" -d merge_when_pipeline_succeeds="true" -d should_remove_source_branch="true"
}
trigger-pipeline(){
# Trigger pipeline on selected package
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment