From 049a2268b4f897854dcc43034f6ea40929ca10f6 Mon Sep 17 00:00:00 2001
From: Tim Jaacks <tim.jaacks@seco.com>
Date: Mon, 28 Nov 2022 14:23:22 +0100
Subject: [PATCH] common: add constant for default GitLab URL
---
scripts/accept_merge_request.py | 2 +-
scripts/check_if_integration_branch_is_up_to_date.py | 2 +-
scripts/common.py | 1 +
scripts/create_merge_request.py | 2 +-
scripts/deploy_gitlab_ci.py | 2 +-
scripts/download_file_from_latest_job.py | 5 ++---
scripts/download_job_artifacts.py | 5 ++---
scripts/get_current_revision_from_manifest.py | 2 +-
scripts/get_integration_sources.py | 3 ++-
scripts/get_merge_requests.py | 2 +-
scripts/get_pipeline_jobs.py | 5 ++---
scripts/get_pipelines.py | 2 +-
scripts/gitlab_backup.py | 4 ++--
scripts/integrate_into_manifest.py | 2 +-
scripts/merge_into_manifest.py | 2 +-
scripts/mirror_pipeline_result.py | 2 +-
scripts/retrigger_integrating_projects.py | 3 ++-
scripts/retrigger_pipeline_jobs.py | 2 +-
scripts/trigger_pipeline.py | 2 +-
scripts/update_submodule.py | 2 +-
20 files changed, 26 insertions(+), 26 deletions(-)
diff --git a/scripts/accept_merge_request.py b/scripts/accept_merge_request.py
index 591c90a5..90e77a41 100755
--- a/scripts/accept_merge_request.py
+++ b/scripts/accept_merge_request.py
@@ -116,7 +116,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/check_if_integration_branch_is_up_to_date.py b/scripts/check_if_integration_branch_is_up_to_date.py
index ce1ac448..01b9dad7 100755
--- a/scripts/check_if_integration_branch_is_up_to_date.py
+++ b/scripts/check_if_integration_branch_is_up_to_date.py
@@ -50,7 +50,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/common.py b/scripts/common.py
index 56c45594..052ab305 100755
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -13,6 +13,7 @@ from gitlab.v4.objects import Project
from gitlab.v4.objects import MergeRequest
+GITLAB_URL = "https://git.seco.com"
MANIFEST_FILE = "default.xml"
SRCREV_FILE = "SRCREV.conf"
PENDING_STATES = ["created", "waiting_for_resource", "preparing", "pending", "running"]
diff --git a/scripts/create_merge_request.py b/scripts/create_merge_request.py
index 22e4591b..4ab7d2ff 100755
--- a/scripts/create_merge_request.py
+++ b/scripts/create_merge_request.py
@@ -53,7 +53,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/deploy_gitlab_ci.py b/scripts/deploy_gitlab_ci.py
index 7de5c81c..b8ad2fe8 100755
--- a/scripts/deploy_gitlab_ci.py
+++ b/scripts/deploy_gitlab_ci.py
@@ -104,7 +104,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/download_file_from_latest_job.py b/scripts/download_file_from_latest_job.py
index 968586a8..7b0478b4 100755
--- a/scripts/download_file_from_latest_job.py
+++ b/scripts/download_file_from_latest_job.py
@@ -6,6 +6,7 @@ Downloads given file of the artifacts of a pipeline job.
"""
import argparse
+import common
import logging
import os
import sys
@@ -18,8 +19,6 @@ __email__ = "jonas.hoeppner@garz-fricke.com"
from download_job_artifacts import download_job_artifact
from get_pipeline_jobs import get_pipeline_jobs
-GITLAB_SERVER = "https://git.seco.com"
-
verbose = 0
@@ -31,7 +30,7 @@ def main(args):
help="""URL to the GitLab instance""",
dest="gitlab_url",
action="store",
- default=GITLAB_SERVER,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/download_job_artifacts.py b/scripts/download_job_artifacts.py
index 07717b1e..7fd313c5 100755
--- a/scripts/download_job_artifacts.py
+++ b/scripts/download_job_artifacts.py
@@ -6,6 +6,7 @@ Downloads the job artifacts of a given job
"""
import argparse
+import common
import logging
import sys
import os
@@ -16,8 +17,6 @@ import gitlab as gl
__author__ = "Jonas Höppner"
__email__ = "jonas.hoeppner@garz-fricke.com"
-GITLAB_SERVER = "https://git.seco.com"
-
verbose = 0
@@ -77,7 +76,7 @@ def main(args):
help="""URL to the GitLab instance""",
dest="gitlab_url",
action="store",
- default=GITLAB_SERVER,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/get_current_revision_from_manifest.py b/scripts/get_current_revision_from_manifest.py
index a35c9af7..6bdc4c4b 100755
--- a/scripts/get_current_revision_from_manifest.py
+++ b/scripts/get_current_revision_from_manifest.py
@@ -84,7 +84,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/get_integration_sources.py b/scripts/get_integration_sources.py
index e78916c7..128add4e 100755
--- a/scripts/get_integration_sources.py
+++ b/scripts/get_integration_sources.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python3
import argparse
+import common
import re
import sys
from gitlab import Gitlab, GitlabGetError
@@ -61,7 +62,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/get_merge_requests.py b/scripts/get_merge_requests.py
index c1fc7c4d..081dba9e 100755
--- a/scripts/get_merge_requests.py
+++ b/scripts/get_merge_requests.py
@@ -46,7 +46,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/get_pipeline_jobs.py b/scripts/get_pipeline_jobs.py
index 71f7f12e..fb00e922 100755
--- a/scripts/get_pipeline_jobs.py
+++ b/scripts/get_pipeline_jobs.py
@@ -6,6 +6,7 @@ Queries the jobs of a given pipeline, filtered by stage
"""
import argparse
+import common
import logging
import sys
import gitlab as gl
@@ -13,8 +14,6 @@ import gitlab as gl
__author__ = "Jonas Höppner"
__email__ = "jonas.hoeppner@garz-fricke.com"
-GITLAB_SERVER = "https://git.seco.com"
-
verbose = 0
@@ -63,7 +62,7 @@ def main(args):
help="""URL to the GitLab instance""",
dest="gitlab_url",
action="store",
- default=GITLAB_SERVER,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/get_pipelines.py b/scripts/get_pipelines.py
index b3c2012a..29bf333d 100755
--- a/scripts/get_pipelines.py
+++ b/scripts/get_pipelines.py
@@ -43,7 +43,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/gitlab_backup.py b/scripts/gitlab_backup.py
index 7df14917..45f1c04b 100755
--- a/scripts/gitlab_backup.py
+++ b/scripts/gitlab_backup.py
@@ -7,6 +7,7 @@ Backup using gitlab project exports for all projects in a given group
import argparse
+import common
import datetime
import logging
import os
@@ -17,7 +18,6 @@ import gitlab as gl
__author__ = "Jonas Höppner"
__email__ = "jonas.hoeppner@garz-fricke.com"
-GITLAB_SERVER = "https://git.seco.com"
# ID of the Seco Northern Europe
GITLAB_GROUP_ID = "556"
@@ -207,7 +207,7 @@ def main(args):
help="""URL to the GitLab instance""",
dest="gitlab_url",
action="store",
- default=GITLAB_SERVER,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/integrate_into_manifest.py b/scripts/integrate_into_manifest.py
index 39ec875b..f387d526 100755
--- a/scripts/integrate_into_manifest.py
+++ b/scripts/integrate_into_manifest.py
@@ -195,7 +195,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/merge_into_manifest.py b/scripts/merge_into_manifest.py
index 4c6b0754..52268224 100755
--- a/scripts/merge_into_manifest.py
+++ b/scripts/merge_into_manifest.py
@@ -124,7 +124,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/mirror_pipeline_result.py b/scripts/mirror_pipeline_result.py
index c2973691..a3d9a466 100755
--- a/scripts/mirror_pipeline_result.py
+++ b/scripts/mirror_pipeline_result.py
@@ -44,7 +44,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/retrigger_integrating_projects.py b/scripts/retrigger_integrating_projects.py
index fe631ece..df5e0f24 100755
--- a/scripts/retrigger_integrating_projects.py
+++ b/scripts/retrigger_integrating_projects.py
@@ -1,5 +1,6 @@
#!/usr/bin/env python3
import argparse
+import common
import sys
from gitlab import Gitlab, GitlabJobRetryError
@@ -19,7 +20,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/retrigger_pipeline_jobs.py b/scripts/retrigger_pipeline_jobs.py
index 11b5258d..e87d40e9 100755
--- a/scripts/retrigger_pipeline_jobs.py
+++ b/scripts/retrigger_pipeline_jobs.py
@@ -65,7 +65,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/trigger_pipeline.py b/scripts/trigger_pipeline.py
index c0d0bada..54a68c94 100755
--- a/scripts/trigger_pipeline.py
+++ b/scripts/trigger_pipeline.py
@@ -12,7 +12,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
diff --git a/scripts/update_submodule.py b/scripts/update_submodule.py
index ea8f5a97..dcf85632 100755
--- a/scripts/update_submodule.py
+++ b/scripts/update_submodule.py
@@ -407,7 +407,7 @@ def main():
"--gitlab-url",
help="""URL to the GitLab instance""",
dest="gitlab_url",
- required=True,
+ default=common.GITLAB_URL,
)
parser.add_argument(
"--token",
--
GitLab