diff --git a/scripts/accept_merge_request.py b/scripts/accept_merge_request.py index 4e35baf9bae32412648e3e225137bda5db851900..591c90a54ea69e69e9119e225017cbab4949b7e8 100755 --- a/scripts/accept_merge_request.py +++ b/scripts/accept_merge_request.py @@ -72,7 +72,7 @@ def accept_merge_request(project, mr, rebase=False, should_remove_source_branch= # No pipeline created yet print("No pipeline created yet") time.sleep(1) - elif mr.head_pipeline["status"] in common.pending_states: + elif mr.head_pipeline["status"] in common.PENDING_STATES: # Pipeline pending if not pipeline_pending: print("Waiting for pending pipeline", end="", flush=True) diff --git a/scripts/common.py b/scripts/common.py index e6e4f654d0d11afba851c5e972d66c7323a5d40c..56c45594e7211563b3347bac19bf610d9d5a0d03 100755 --- a/scripts/common.py +++ b/scripts/common.py @@ -13,9 +13,9 @@ from gitlab.v4.objects import Project from gitlab.v4.objects import MergeRequest -manifest_file = "default.xml" -srcrev_file = "SRCREV.conf" -pending_states = ["created", "waiting_for_resource", "preparing", "pending", "running"] +MANIFEST_FILE = "default.xml" +SRCREV_FILE = "SRCREV.conf" +PENDING_STATES = ["created", "waiting_for_resource", "preparing", "pending", "running"] def integration_branch_name(project_name, source_branch_name, target_branch_name): diff --git a/scripts/deploy_gitlab_ci.py b/scripts/deploy_gitlab_ci.py index daa1c7cfec71f76d5f9bec9be3375063532cf909..7de5c81c69eeec1edcb88814b7e94a113588ebe7 100755 --- a/scripts/deploy_gitlab_ci.py +++ b/scripts/deploy_gitlab_ci.py @@ -162,14 +162,14 @@ def main(): "--manifest-file", help="""manifest file name (default: 'default.xml')""", dest="manifest_file", - default=common.manifest_file, + default=common.MANIFEST_FILE, required=False, ) parser.add_argument( "--srcrev-file", help="""source revision file name (default: 'SRCREV.conf')""", dest="srcrev_file", - default=common.srcrev_file, + default=common.SRCREV_FILE, required=False, ) parser.add_argument( diff --git a/scripts/get_current_revision_from_manifest.py b/scripts/get_current_revision_from_manifest.py index 16d6f90b0f02390f165a81cb93c6c85235ac49c0..a35c9af7baf6ade5c438f338582f3e38612f7a45 100755 --- a/scripts/get_current_revision_from_manifest.py +++ b/scripts/get_current_revision_from_manifest.py @@ -15,7 +15,7 @@ def get_current_revision_from_manifest( manifest_branch, project: Project, recipe_name=None, - srcrev_file=common.srcrev_file, + srcrev_file=common.SRCREV_FILE, ): """ Reads the xml manifest an the SRC_REVC file in the given manifest project @@ -114,7 +114,7 @@ def main(): "--srcrev-file", help="""source revision file name (default: 'SRCREV.conf')""", dest="srcrev_file", - default=common.srcrev_file, + default=common.SRCREV_FILE, required=False, ) parser.add_argument( diff --git a/scripts/integrate_into_manifest.py b/scripts/integrate_into_manifest.py index 26444c522ad663d5eb1f821d73e0c0605f123956..39ec875b2cc3f260bcb0224270981059bbe26bc3 100755 --- a/scripts/integrate_into_manifest.py +++ b/scripts/integrate_into_manifest.py @@ -219,14 +219,14 @@ def main(): "--manifest-file", help="""manifest file name (default: 'default.xml')""", dest="manifest_file", - default=common.manifest_file, + default=common.MANIFEST_FILE, required=False, ) parser.add_argument( "--srcrev-file", help="""source revision file name (default: 'SRCREV.conf')""", dest="srcrev_file", - default=common.srcrev_file, + default=common.SRCREV_FILE, required=False, ) parser.add_argument( diff --git a/scripts/merge_into_manifest.py b/scripts/merge_into_manifest.py index d60daad8570201a6437a53fa0350e43d8e737cd8..4c6b075482cef561e6e4bed92cf398690b0ba3ff 100755 --- a/scripts/merge_into_manifest.py +++ b/scripts/merge_into_manifest.py @@ -96,7 +96,7 @@ def merge_into_manifest( manifest_revision = integrate_into_manifest( manifest_project=manifest_project, manifest_branch=target_branch, - manifest_file=common.manifest_file, + manifest_file=common.MANIFEST_FILE, srcrev_file=srcrev_file, recipe_name=recipe_name, project=project, @@ -161,7 +161,7 @@ def main(): "--srcrev-file", help="""source revision file name (default: 'SRCREV.conf')""", dest="srcrev_file", - default=common.srcrev_file, + default=common.SRCREV_FILE, required=False, ) parser.add_argument(