omit printing var changes from None to None, do not try to set vars and protected envs if jobs disabled

Author: Jetman80

projects.py

@@ -149,7 +149,7 @@ def apply_vars_gorp(gorp_kind, yaml_dict, gorp, gorp_dict, variables_clean_all_b
                 # Compare existing vars with yaml vars
                 # If any difference, print
                 if (
-                    gorp_var.value != str(var["value"])
+                    (gorp_var.value != str(var["value"]) and not (gorp_var.value is None and var["value"] is None))
                     or
                     gorp_var.variable_type != var["variable_type"]
                     or
@@ -161,7 +161,7 @@ def apply_vars_gorp(gorp_kind, yaml_dict, gorp, gorp_dict, variables_clean_all_b
                 ):
                     print("changed: {scope} / {var}:".format(scope=var["environment_scope"], var=var["key"]))
                     # Print old -> new
-                    if gorp_var.value != str(var["value"]):
+                    if gorp_var.value != str(var["value"]) and not (gorp_var.value is None and var["value"] is None):
                         print("  value: {old} -> {new}".format(old=gorp_var.value, new=var["value"]))
                     if gorp_var.variable_type != var["variable_type"]:
                         print("  variable_type: {old} -> {new}".format(old=gorp_var.variable_type, new=var["variable_type"]))
@@ -503,7 +503,7 @@ def create_var(var):
                         if not args.dry_run_gitlab:
 
                             # CI Variables
-                            if "variables" in project_dict:
+                            if "variables" in project_dict and not ("jobs_enabled" in project_dict and project_dict["jobs_enabled"] is False):
 
                                 logger.info("Found project yaml definition for vars: {variables}".format(variables=project_dict["variables"]))
 
@@ -720,8 +720,6 @@ def create_var(var):
                             project.container_registry_enabled = project_dict["container_registry_enabled"]
                         if "jobs_enabled" in project_dict:
                             project.jobs_enabled = project_dict["jobs_enabled"]
-                        if "jobs_enabled" in project_dict:
-                            project.jobs_enabled = project_dict["jobs_enabled"]
                         if "lfs_enabled" in project_dict:
                             project.lfs_enabled = project_dict["lfs_enabled"]
                         if "merge_requests_enabled" in project_dict:
@@ -1081,7 +1079,7 @@ def create_var(var):
                                             project.runners.create({'runner_id': runner.id})
 
                         # Protected envs
-                        if "protected_environments" in project_dict:
+                        if "protected_environments" in project_dict and not ("jobs_enabled" in project_dict and project_dict["jobs_enabled"] is False):
                             for env in project_dict["protected_environments"]:
                                 # Create env first
                                 if not any(p_env.name == env["name"] for p_env in project.environments.list(get_all=True)):
@@ -1125,7 +1123,7 @@ def create_var(var):
                                     logger.info(process.stderr)
 
                         # CI Variables
-                        if "variables" in project_dict:
+                        if "variables" in project_dict and not ("jobs_enabled" in project_dict and project_dict["jobs_enabled"] is False):
 
                             # Check variables_clean_all_before_set
                             if args.variables_clean_all_before_set or ("variables_clean_all_before_set" in project_dict and project_dict["variables_clean_all_before_set"]):