Skip to content
Snippets Groups Projects
Commit d04adeae authored by Tim Jaacks's avatar Tim Jaacks
Browse files

common: use uppercase for constants

parent 7a4255b7
No related branches found
No related tags found
1 merge request!221common: use uppercase for constants
Pipeline #44668 passed with stage
in 2 minutes and 18 seconds
...@@ -72,7 +72,7 @@ def accept_merge_request(project, mr, rebase=False, should_remove_source_branch= ...@@ -72,7 +72,7 @@ def accept_merge_request(project, mr, rebase=False, should_remove_source_branch=
# No pipeline created yet # No pipeline created yet
print("No pipeline created yet") print("No pipeline created yet")
time.sleep(1) time.sleep(1)
elif mr.head_pipeline["status"] in common.pending_states: elif mr.head_pipeline["status"] in common.PENDING_STATES:
# Pipeline pending # Pipeline pending
if not pipeline_pending: if not pipeline_pending:
print("Waiting for pending pipeline", end="", flush=True) print("Waiting for pending pipeline", end="", flush=True)
......
...@@ -13,9 +13,9 @@ from gitlab.v4.objects import Project ...@@ -13,9 +13,9 @@ from gitlab.v4.objects import Project
from gitlab.v4.objects import MergeRequest from gitlab.v4.objects import MergeRequest
manifest_file = "default.xml" MANIFEST_FILE = "default.xml"
srcrev_file = "SRCREV.conf" SRCREV_FILE = "SRCREV.conf"
pending_states = ["created", "waiting_for_resource", "preparing", "pending", "running"] PENDING_STATES = ["created", "waiting_for_resource", "preparing", "pending", "running"]
def integration_branch_name(project_name, source_branch_name, target_branch_name): def integration_branch_name(project_name, source_branch_name, target_branch_name):
......
...@@ -162,14 +162,14 @@ def main(): ...@@ -162,14 +162,14 @@ def main():
"--manifest-file", "--manifest-file",
help="""manifest file name (default: 'default.xml')""", help="""manifest file name (default: 'default.xml')""",
dest="manifest_file", dest="manifest_file",
default=common.manifest_file, default=common.MANIFEST_FILE,
required=False, required=False,
) )
parser.add_argument( parser.add_argument(
"--srcrev-file", "--srcrev-file",
help="""source revision file name (default: 'SRCREV.conf')""", help="""source revision file name (default: 'SRCREV.conf')""",
dest="srcrev_file", dest="srcrev_file",
default=common.srcrev_file, default=common.SRCREV_FILE,
required=False, required=False,
) )
parser.add_argument( parser.add_argument(
......
...@@ -15,7 +15,7 @@ def get_current_revision_from_manifest( ...@@ -15,7 +15,7 @@ def get_current_revision_from_manifest(
manifest_branch, manifest_branch,
project: Project, project: Project,
recipe_name=None, 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 Reads the xml manifest an the SRC_REVC file in the given manifest project
...@@ -114,7 +114,7 @@ def main(): ...@@ -114,7 +114,7 @@ def main():
"--srcrev-file", "--srcrev-file",
help="""source revision file name (default: 'SRCREV.conf')""", help="""source revision file name (default: 'SRCREV.conf')""",
dest="srcrev_file", dest="srcrev_file",
default=common.srcrev_file, default=common.SRCREV_FILE,
required=False, required=False,
) )
parser.add_argument( parser.add_argument(
......
...@@ -219,14 +219,14 @@ def main(): ...@@ -219,14 +219,14 @@ def main():
"--manifest-file", "--manifest-file",
help="""manifest file name (default: 'default.xml')""", help="""manifest file name (default: 'default.xml')""",
dest="manifest_file", dest="manifest_file",
default=common.manifest_file, default=common.MANIFEST_FILE,
required=False, required=False,
) )
parser.add_argument( parser.add_argument(
"--srcrev-file", "--srcrev-file",
help="""source revision file name (default: 'SRCREV.conf')""", help="""source revision file name (default: 'SRCREV.conf')""",
dest="srcrev_file", dest="srcrev_file",
default=common.srcrev_file, default=common.SRCREV_FILE,
required=False, required=False,
) )
parser.add_argument( parser.add_argument(
......
...@@ -96,7 +96,7 @@ def merge_into_manifest( ...@@ -96,7 +96,7 @@ def merge_into_manifest(
manifest_revision = integrate_into_manifest( manifest_revision = integrate_into_manifest(
manifest_project=manifest_project, manifest_project=manifest_project,
manifest_branch=target_branch, manifest_branch=target_branch,
manifest_file=common.manifest_file, manifest_file=common.MANIFEST_FILE,
srcrev_file=srcrev_file, srcrev_file=srcrev_file,
recipe_name=recipe_name, recipe_name=recipe_name,
project=project, project=project,
...@@ -161,7 +161,7 @@ def main(): ...@@ -161,7 +161,7 @@ def main():
"--srcrev-file", "--srcrev-file",
help="""source revision file name (default: 'SRCREV.conf')""", help="""source revision file name (default: 'SRCREV.conf')""",
dest="srcrev_file", dest="srcrev_file",
default=common.srcrev_file, default=common.SRCREV_FILE,
required=False, required=False,
) )
parser.add_argument( parser.add_argument(
......
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