From f0e40542d73f147a6e914bcb7cbb56ab00fd8470 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 12 Apr 2021 11:05:03 +0100 Subject: [PATCH 1/2] Correcting merge test to only check open MRs --- testing/merge_test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/testing/merge_test.py b/testing/merge_test.py index fc3e580..c9470f2 100644 --- a/testing/merge_test.py +++ b/testing/merge_test.py @@ -4,7 +4,7 @@ import requests import json import subprocess -crCommitBranch = os.environ.get("CI_COMMIT_REF_NAME", "NOTFOUND") +crCommitBranch = os.environ.get("CI_COMMIT_REF_NAME", "cr/TS33128/0165") apiUrl = os.environ.get("CI_API_V4_URL", "https://forge.3gpp.org/rep/api/v4") projectId = os.environ.get("CI_PROJECT_ID", "13") @@ -23,13 +23,15 @@ def do (commandline): print ("Searching for corresponding MR...") -mrs = gapi(f"merge_requests?source_branch={crCommitBranch}") +mrs = gapi(f"merge_requests?source_branch={crCommitBranch}&state=opened") if len(mrs) == 0: print ("No MR found... aborting") exit() if len(mrs) > 1: print (f"{len(mrs)} MRs found, 1 expected - aborting") + for m in mrs: + pprint.pprint(m) exit(-1) mr = mrs[0] -- GitLab From 88a4ad35cd0da601b288f29eb63f69f18039af14 Mon Sep 17 00:00:00 2001 From: mark Date: Mon, 12 Apr 2021 11:21:11 +0100 Subject: [PATCH 2/2] Correcting merge test --- testing/merge_test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/merge_test.py b/testing/merge_test.py index c9470f2..b7a82b3 100644 --- a/testing/merge_test.py +++ b/testing/merge_test.py @@ -4,7 +4,7 @@ import requests import json import subprocess -crCommitBranch = os.environ.get("CI_COMMIT_REF_NAME", "cr/TS33128/0165") +crCommitBranch = os.environ.get("CI_COMMIT_REF_NAME", "NOTFOUND") apiUrl = os.environ.get("CI_API_V4_URL", "https://forge.3gpp.org/rep/api/v4") projectId = os.environ.get("CI_PROJECT_ID", "13") -- GitLab