move yaml lib into artcommon lib

artcommon/artcommonlib/util.py

@@ -34,6 +34,15 @@ def remove_suffix(s: str, suffix: str) -> str:
         return s[:]
 
 
+def yaml_handler():
+    yaml = YAML(typ="rt")
+    yaml.default_flow_style = False
+    yaml.preserve_quotes = True
+    yaml.width = 4096
+    yaml.indent(mapping=2,sequence=4,offset=2)
+    return yaml
+
+
 def convert_remote_git_to_https(source_url: str):
     """
     Accepts a source git URL in ssh or https format and return it in a normalized

pyartcd/pyartcd/pipelines/build_microshift.py

@@ -10,11 +10,10 @@
 
 from artcommonlib.arch_util import brew_arch_for_go_arch
 from artcommonlib.assembly import AssemblyTypes
-from artcommonlib.util import get_ocp_version_from_group
+from artcommonlib.util import get_ocp_version_from_group, yaml_handler
 from artcommonlib import exectools
 from doozerlib.util import isolate_nightly_name_components
 from ghapi.all import GhApi
-from ruamel.yaml import YAML
 from semver import VersionInfo
 from tenacity import retry, stop_after_attempt, wait_fixed
 
@@ -30,10 +29,7 @@
                           default_release_suffix,
                           get_microshift_builds)
 
-yaml = YAML(typ="rt")
-yaml.default_flow_style = False
-yaml.preserve_quotes = True
-yaml.width = 4096
+yaml = yaml_handler()
 
 
 class BuildMicroShiftPipeline:

pyartcd/pyartcd/pipelines/build_microshift_bootc.py

@@ -6,10 +6,9 @@
 import asyncio
 import traceback
 from typing import Optional
-from ruamel.yaml import YAML
 
 from artcommonlib.assembly import AssemblyTypes
-from artcommonlib.util import get_ocp_version_from_group, isolate_major_minor_in_group
+from artcommonlib.util import get_ocp_version_from_group, isolate_major_minor_in_group, yaml_handler
 from artcommonlib.konflux.konflux_build_record import KonfluxBuildOutcome, Engine, ArtifactType, KonfluxBuildRecord
 from artcommonlib.konflux.konflux_db import KonfluxDb
 from artcommonlib.arch_util import brew_arch_for_go_arch
@@ -27,10 +26,7 @@
 from pyartcd.plashets import build_plashets, plashet_config_for_major_minor
 from doozerlib.constants import ART_DEFAULT_IMAGE_REPO
 
-yaml = YAML(typ="rt")
-yaml.default_flow_style = False
-yaml.preserve_quotes = True
-yaml.width = 4096
+yaml = yaml_handler()
 
 
 class BuildMicroShiftBootcPipeline:

pyartcd/pyartcd/pipelines/gen_assembly.py

@@ -10,9 +10,8 @@
 import aiohttp
 import click
 from ghapi.all import GhApi
-from ruamel.yaml import YAML
 
-from artcommonlib.util import split_git_url, merge_objects, get_inflight, isolate_major_minor_in_group
+from artcommonlib.util import split_git_url, merge_objects, get_inflight, isolate_major_minor_in_group, yaml_handler
 from artcommonlib import exectools
 from doozerlib.cli.get_nightlies import rc_api_url
 from pyartcd import constants, jenkins
@@ -21,10 +20,7 @@
 from pyartcd.jenkins import start_build_sync
 from pyartcd.runtime import Runtime
 
-yaml = YAML(typ="rt")
-yaml.default_flow_style = False
-yaml.preserve_quotes = True
-yaml.width = 4096
+yaml = yaml_handler()
 
 
 class GenAssemblyPipeline:

pyartcd/pyartcd/pipelines/prepare_release.py

@@ -15,13 +15,12 @@
 from subprocess import PIPE
 from typing import Dict, List, Optional, Sequence, Tuple
 from jira.resources import Issue
-from ruamel.yaml import YAML
 from tenacity import retry, stop_after_attempt, wait_fixed
 from datetime import datetime, timedelta, timezone
 
 from artcommonlib.assembly import AssemblyTypes, assembly_group_config
 from artcommonlib.model import Model
-from artcommonlib.util import get_assembly_release_date
+from artcommonlib.util import get_assembly_release_date, yaml_handler
 from elliottlib.errata import set_blocking_advisory, get_blocking_advisories, push_cdn_stage, is_advisory_editable
 from elliottlib.errata_async import AsyncErrataAPI
 from elliottlib.errata import set_blocking_advisory, get_blocking_advisories
@@ -38,7 +37,7 @@
 
 
 _LOGGER = logging.getLogger(__name__)
-
+yaml = yaml_handler()
 
 class PrepareReleasePipeline:
     def __init__(
@@ -387,10 +386,6 @@ async def load_releases_config(self) -> Optional[None]:
             return None
         async with aiofiles.open(path, "r") as f:
             content = await f.read()
-        yaml = YAML(typ="safe")
-        yaml.default_flow_style = False
-        yaml.preserve_quotes = True
-        yaml.width = 4096
         return yaml.load(content)
 
     @cached_property
@@ -504,10 +499,6 @@ async def load_group_config(self) -> Dict:
             await self.clone_build_data(repo)
         async with aiofiles.open(repo / "group.yml", "r") as f:
             content = await f.read()
-        yaml = YAML(typ="safe")
-        yaml.default_flow_style = False
-        yaml.preserve_quotes = True
-        yaml.width = 4096
         return yaml.load(content)
 
     def check_blockers(self):
@@ -607,10 +598,6 @@ async def update_build_data(self, advisories: Dict[str, int], jira_issue_key: Op
                 f.write(group_config)
         else:
             # update releases.yml (if we are operating on a non-stream assembly)
-            yaml = YAML(typ="rt")
-            yaml.default_flow_style = False
-            yaml.preserve_quotes = True
-            yaml.width = 4096
             async with aiofiles.open(repo / "releases.yml", "r") as f:
                 old = await f.read()
             releases_config = yaml.load(old)

pyartcd/pyartcd/pipelines/review_cvp.py

@@ -8,17 +8,13 @@
 import click
 from ghapi.all import GhApi
 from artcommonlib import exectools
+from artcommonlib.util import yaml_handler
 from pyartcd import jenkins, constants
 from pyartcd.cli import cli, click_coroutine, pass_runtime
 from pyartcd.git import GitRepository
 from pyartcd.runtime import Runtime
-from ruamel.yaml import YAML
-
-yaml = YAML(typ="rt")
-yaml.default_flow_style = False
-yaml.preserve_quotes = True
-yaml.width = 4096
 
+yaml = yaml_handler()
 
 class ReviewCVPPipeline:
     def __init__(self, runtime: Runtime, group: str, assembly: str) -> None:

pyartcd/pyartcd/pipelines/update_golang.py

@@ -14,6 +14,7 @@
 from artcommonlib.release_util import split_el_suffix_in_release
 from artcommonlib.rpm_utils import parse_nvr
 from artcommonlib import exectools
+from artcommonlib.util import yaml_handler
 from pyartcd import jenkins
 from pyartcd.constants import GITHUB_OWNER
 from pyartcd.cli import cli, click_coroutine, pass_runtime
@@ -24,11 +25,7 @@
 from elliottlib import util as elliottutil
 
 _LOGGER = logging.getLogger(__name__)
-
-yaml = YAML(typ="rt")
-yaml.default_flow_style = False
-yaml.preserve_quotes = True
-yaml.width = 4096
+yaml = yaml_handler()
 
 
 def is_latest_build(ocp_version: str, el_v: int, nvr: str, koji_session) -> bool: