mrtest: fix origin using new GitLabOrigin object (MR 40)

mrhlpr/mr.py

@@ -127,7 +127,7 @@ def get_artifacts_zip(mr_id, no_cache=False, origin=None):
     :returns: path to downloaded artifacts.zip file
     """
     # Get the latest pipeline (without cache so we don't miss newer ones)
-    url_mr = "/projects/{}/merge_requests/{}".format(origin["api_project_id"], mr_id)
+    url_mr = "/projects/{}/merge_requests/{}".format(origin.api_project_id, mr_id)
     api = gitlab.download_json(origin, url_mr, no_cache=True)
     if "pipeline" not in api:
         logging.error("ERROR: no pipeline found in merge request")
@@ -155,7 +155,7 @@ def get_artifacts_zip(mr_id, no_cache=False, origin=None):
         exit(1)
 
     # Download artifacts zip (with cache)
-    return gitlab.download_artifacts_zip(origin["api"], pipeline_project_id, job)
+    return gitlab.download_artifacts_zip(origin.api, pipeline_project_id, job)
 
 
 def checkout(

mrtest/__init__.py

@@ -17,7 +17,7 @@ def get_virtual_group(origin, mr_id):
     packages from a merge request.
     :param origin: gitlab origin information, see gitlab.parse_git_origin()
     :param mr_id: merge request ID"""
-    return f".mrtest-{mr_id}-{origin['project']}"
+    return f".mrtest-{mr_id}-{origin.project}"
 
 
 def is_root_user():

mrtest/add_packages.py

@@ -73,7 +73,7 @@ def confirm_mr_id(origin, mr_id):
     :param origin: gitlab origin information, see gitlab.parse_git_origin()
     :param mr_id: merge request ID
     """
-    link = f"https://{origin['host']}/{origin['project_id']}/-/merge_requests/{mr_id}"
+    link = f"https://{origin.host}/{origin.project_id}/-/merge_requests/{mr_id}"
 
     status = mrhlpr.mr.get_status(mr_id, origin=origin)
 

mrtest/origin.py

@@ -3,20 +3,24 @@
 """Origin information about gitlab instances relevant to mrtest, in the format
 needed for mrhlpr.gitlab.parse_git_origin()."""
 
-pmaports = {
-    "api": "https://gitlab.com/api/v4",
-    "api_project_id": "postmarketOS%2Fpmaports",
-    "full": "git@gitlab.com:postmarketOS/pmaports.git",
-    "project": "postmarketOS",
-    "project_id": "postmarketOS/pmaports",
-    "host": "gitlab.com",
-}
+from mrhlpr.gitlab import GitLabOrigin
 
-aports = {
-    "api": "https://gitlab.alpinelinux.org/api/v4",
-    "api_project_id": "alpine%2Faports",
-    "full": "git@gitlab.alpinelinux.org:alpine/aports.git",
-    "project": "alpine",
-    "project_id": "alpine/aports",
-    "host": "gitlab.alpinelinux.org",
-}
+pmaports = GitLabOrigin(
+    api="https://gitlab.com/api/v4",
+    api_project_id="postmarketOS%2Fpmaports",
+    full="git@gitlab.com:postmarketOS/pmaports.git",
+    project="postmarketOS",
+    project_id="postmarketOS/pmaports",
+    host="gitlab.com",
+    username=None,
+)
+
+aports = GitLabOrigin(
+    api="https://gitlab.alpinelinux.org/api/v4",
+    api_project_id="alpine%2Faports",
+    full="git@gitlab.alpinelinux.org:alpine/aports.git",
+    project="alpine",
+    project_id="alpine/aports",
+    host="gitlab.alpinelinux.org",
+    username=None,
+)