diff --git a/deploy_gitlab_ci.py b/deploy_gitlab_ci.py index 4f2445f93b319aea7f17040f96f0336a6cff94e3..a99f2afc0547f109b9e3add863465edadeb47911 100755 --- a/deploy_gitlab_ci.py +++ b/deploy_gitlab_ci.py @@ -15,14 +15,14 @@ from update_gitlab_ci import update_gitlab_ci_include from ruamel.yaml import YAML -def update_rev_in_gitlab_ci(repo, submodule_project, submodule_revision): - - # Add changed revision also to .gitlab-ci.yml - gitlab_ci_yml = os.path.join(repo.working_tree_dir, ".gitlab-ci.yml") - - # ====================================== - # Hack to deploy the .gitlab-ci.yml which does the include - # to the child project +def create_gitlab_ci_yml(repo, gitlab_ci_yml): + """This code snippet was used to initially populate + all repos with the minial .gitlab-ci.yml that + includes the files from this repo. + Currently it is not used and only the revision is + changed. + It has also never been test as this function. + """ logging.debug("Origin: %s", repo.remotes.origin.url) # Contains the base file to be used in the subprojects @@ -83,6 +83,12 @@ include: # ====================================== + +def update_rev_in_gitlab_ci(repo, submodule_project, submodule_revision): + + # Add changed revision also to .gitlab-ci.yml + gitlab_ci_yml = os.path.join(repo.working_tree_dir, ".gitlab-ci.yml") + if update_gitlab_ci_include( gitlab_ci_yml, submodule_project.web_url.split("//")[1].split("/", 1)[1], @@ -231,7 +237,6 @@ def main(): merge_requests = [] # If submodule is already at specified revision, exit successfully - # TODO: is this correct for multi deploy also? if not integration_branch: sys.exit(0)