Skip to content

ART-19029: feat(doozer): use openshift/golang-builder for released golang-builder pullspec #2937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
lgarciaaco wants to merge 1 commit into
base: main
Choose a base branch
from
Open

ART-19029: feat(doozer): use openshift/golang-builder for released golang-builder pullspec #2937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doozer/doozerlib/constants.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,3 +92,4 @@
KONFLUX_RELEASE_FBC_EC_POLICY_CONFIGURATION = "rhtap-releng-tenant/fbc-ocp-art-stage"

ART_IMAGES_BASE_APPLICATION = "art-images-base"
ART_IMAGES_GOLANG_BUILDER_APPLICATION = "golang-builder"
20 changes: 20 additions & 0 deletions doozer/doozerlib/image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1461,6 +1461,26 @@ def should_trigger_base_image_release(self) -> bool:
self.logger.info(f"Base image release enabled set from {source} {base_image_release_enabled}")
return base_image_release_enabled

def is_base_image_release_quay_fallback_enabled(self) -> bool:
"""
When False and ``should_trigger_base_image_release()`` applies, late parent resolve
must not fall back to Konflux ``image_pullspec`` if the ``registry.redhat.io`` delivery mirror
(``openshift/golang-builder`` for golang builders, ``openshift/art-images-base`` for other base_only images)
is unreachable (rebase fails instead).

Image ``base_image_release.quay_fallback`` overrides group; default True
(same pattern as ``konflux.cachi2.lockfile.enabled``).
"""
base_image_release_quay_fallback_config_override = self.config.base_image_release.quay_fallback
if base_image_release_quay_fallback_config_override not in [Missing, None]:
return bool(base_image_release_quay_fallback_config_override)
else:
base_image_release_quay_fallback_group_override = self.runtime.group_config.base_image_release.quay_fallback
if base_image_release_quay_fallback_group_override not in [Missing, None]:
return bool(base_image_release_quay_fallback_group_override)

return True

def get_required_artifacts(self) -> list:
"""
Get list of required artifacts from image config.
Expand Down
13 changes: 11 additions & 2 deletions doozer/doozerlib/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,17 @@ def ignore_aliases(self, data):


def rh_art_images_base_pullspec(nvr: str) -> str:
"""Pullspec for golang/base images after art-images-base release (NVR = component-version-release)."""
return f"{doozer_constants.DELIVERY_IMAGE_REGISTRY}/openshift/{doozer_constants.ART_IMAGES_BASE_APPLICATION}:{nvr}"
"""registry.redhat.io pullspec after Konflux silent release (image tag = full publish NVR string).

openshift-golang-builder image NVRs publish under openshift/ ``ART_IMAGES_GOLANG_BUILDER_APPLICATION``.
Other silent-released base images publish under openshift/ ``ART_IMAGES_BASE_APPLICATION``.
"""
repo_app = (
doozer_constants.ART_IMAGES_GOLANG_BUILDER_APPLICATION
if nvr.startswith("openshift-golang-builder")
else doozer_constants.ART_IMAGES_BASE_APPLICATION
)
return f"{doozer_constants.DELIVERY_IMAGE_REGISTRY}/openshift/{repo_app}:{nvr}"


def dict_get(dct, path, default=DICT_EMPTY):
Expand Down
21 changes: 15 additions & 6 deletions doozer/tests/backend/test_rebaser.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1504,10 +1504,19 @@ def test_single_segment(self):


class TestRhArtImagesBasePullspec(TestCase):
def test_rh_art_images_base_pullspec_matches_db_convention(self):
def test_golang_builder_uses_delivery_golang_repo(self):
from doozerlib.util import rh_art_images_base_pullspec

nvr = "openshift-golang-builder-container-v1.21-1.el9"
self.assertEqual(
rh_art_images_base_pullspec(nvr),
f"registry.redhat.io/openshift/golang-builder:{nvr}",
)

def test_non_golang_base_uses_art_images_base_repo(self):
from doozerlib.util import rh_art_images_base_pullspec

nvr = "ose-base-rhel9-container-v1.0.0-test"
self.assertEqual(
rh_art_images_base_pullspec(nvr),
f"registry.redhat.io/openshift/art-images-base:{nvr}",
Expand Down Expand Up @@ -1545,11 +1554,11 @@ async def test_resolve_member_parent_uses_rh_when_art_base_and_labels_present(se
resolved, _embargo = await rebaser._resolve_member_parent("golang-builder", "ignored")
self.assertEqual(
resolved,
"registry.redhat.io/openshift/art-images-base:openshift-golang-builder-container-v1.21-1.el9",
"registry.redhat.io/openshift/golang-builder:openshift-golang-builder-container-v1.21-1.el9",
)

async def test_resolve_member_parent_late_resolve_uses_rh_art_base_tag(self):
"""Late-resolve (DB) base/golang: RH art-images-base when tag is reachable."""
async def test_resolve_member_parent_late_resolve_uses_rh_delivery_tag(self):
"""Late-resolve (DB) golang-builder: openshift/golang-builder on RH if reachable, else Konflux digest."""
parent = MagicMock()
parent.distgit_key = "golang-builder"
parent.should_trigger_base_image_release.return_value = True
Expand Down Expand Up @@ -1577,7 +1586,7 @@ async def test_resolve_member_parent_late_resolve_uses_rh_art_base_tag(self):

resolved, emb = await rebaser._resolve_member_parent("golang-builder", "orig")
self.assertEqual(
resolved, "registry.redhat.io/openshift/art-images-base:openshift-golang-builder-container-v1.21-1.el9"
resolved, "registry.redhat.io/openshift/golang-builder:openshift-golang-builder-container-v1.21-1.el9"
Comment thread
coderabbitai[bot] marked this conversation as resolved.
)
self.assertFalse(emb)

Expand Down Expand Up @@ -1608,7 +1617,7 @@ async def test_resolve_member_parent_late_resolve_fails_when_art_base_missing(se
rebaser.derived_group = "openshift-4.18"
rebaser._registry_pullspec_exists = AsyncMock(return_value=False)

rh_pullspec = "registry.redhat.io/openshift/art-images-base:openshift-golang-builder-container-v1.21-1.el9"
rh_pullspec = "registry.redhat.io/openshift/golang-builder:openshift-golang-builder-container-v1.21-1.el9"
with self.assertRaises(IOError) as ctx:
await rebaser._resolve_member_parent("golang-builder", "orig")
self.assertIn("golang-builder", str(ctx.exception))
Expand Down
3 changes: 2 additions & 1 deletion elliott/elliottlib/cli/get_golang_report_cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,8 @@ def golang_report_for_version(runtime, ocp_version: str, ignore_rhel: bool = Fal
else:
tag = image_nvr_like.split(':')[-1]
if tag.startswith('openshift-golang-builder-container-'):
# registry.redhat.io/openshift/art-images-base:openshift-golang-builder-container-v1.25.8-...
# registry.redhat.io/openshift/golang-builder:openshift-golang-builder-container-v1.25.8-...
# (formerly art-images-base before ART moved published golang builders)
# Tag is already in NVR name format
nvr = tag
else:
Expand Down
6 changes: 2 additions & 4 deletions pyartcd/pyartcd/pipelines/update_golang.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
GOLANG_NVR_LABEL,
KONFLUX_DEFAULT_IMAGE_REPO,
PRODUCT_NAMESPACE_MAP,
REGISTRY_REDHAT_IO,
)
from artcommonlib.github_auth import get_github_client_for_org
from artcommonlib.konflux.konflux_build_record import ArtifactType, Engine, KonfluxBuildOutcome, KonfluxBuildRecord
Expand All @@ -25,7 +24,7 @@
from artcommonlib.rpm_utils import parse_nvr
from artcommonlib.util import new_roundtrip_yaml_handler
from doozerlib.cli.config_plashet import KNOWN_SIGNING_KEYS
from doozerlib.constants import ART_IMAGES_BASE_APPLICATION
from doozerlib.util import rh_art_images_base_pullspec
from elliottlib import util as elliottutil
from elliottlib.constants import GOLANG_BUILDER_CVE_COMPONENT
from tenacity import before_sleep_log, retry, retry_if_exception_type, stop_after_attempt, wait_exponential
Expand All @@ -38,7 +37,6 @@

_LOGGER = logging.getLogger(__name__)
yaml = new_roundtrip_yaml_handler()
PUBLISHED_GOLANG_BUILDER_REPO = f"{REGISTRY_REDHAT_IO}/openshift/{ART_IMAGES_BASE_APPLICATION}"


def is_latest(ocp_version: str, el_v: int, nvr: str, koji_session) -> bool:
Expand Down Expand Up @@ -781,7 +779,7 @@ def _get_builder_pullspec(self, builder_nvr: str):
elif component_name != GOLANG_BUILDER_CVE_COMPONENT:
raise ValueError(f"Expected a golang builder image NVR, got: {builder_nvr}")
published_nvr = f'{component_name}-{parsed_nvr["version"]}-{parsed_nvr["release"]}'
return f'{PUBLISHED_GOLANG_BUILDER_REPO}:{published_nvr}'
return rh_art_images_base_pullspec(published_nvr)

@staticmethod
def _get_konflux_builder_pullspec(builder_nvr: str):
Expand Down
8 changes: 4 additions & 4 deletions pyartcd/tests/pipelines/test_update_golang.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ def test_get_builder_pullspec(self, mock_konflux_db):

self.assertEqual(
pullspec,
"registry.redhat.io/openshift/art-images-base:"
"registry.redhat.io/openshift/golang-builder:"
"openshift-golang-builder-container-v1.25.8-202604150744.p2.gf28329a.el9",
)

Expand All @@ -849,7 +849,7 @@ def test_get_builder_pullspec_normalizes_konflux_nvr_name(self, mock_konflux_db)

self.assertEqual(
pullspec,
"registry.redhat.io/openshift/art-images-base:"
"registry.redhat.io/openshift/golang-builder:"
"openshift-golang-builder-container-v1.25.8-202604150744.p2.gf28329a.el9",
)

Expand All @@ -867,7 +867,7 @@ async def test_ensure_builder_pullspec_available_reuses_oc_helper(self, mock_kon
"""Test published pullspec availability check reuses pyartcd.oc.get_image_info with quay auth"""
pipeline = self._make_pipeline(build_system="konflux")

pullspec = "registry.redhat.io/openshift/art-images-base:openshift-golang-builder-container-v1.25.8-test"
pullspec = "registry.redhat.io/openshift/golang-builder:openshift-golang-builder-container-v1.25.8-test"
quay_auth_file = str(Path(self.enterContext(tempfile.TemporaryDirectory())) / "quay-auth.json")

with patch.dict(
Expand All @@ -885,7 +885,7 @@ async def test_ensure_builder_pullspec_available_errors_when_oc_helper_fails(sel
"""Test published pullspec availability check raises when pyartcd.oc.get_image_info fails"""
pipeline = self._make_pipeline(build_system="konflux")

pullspec = "registry.redhat.io/openshift/art-images-base:openshift-golang-builder-container-v1.25.8-test"
pullspec = "registry.redhat.io/openshift/golang-builder:openshift-golang-builder-container-v1.25.8-test"
get_image_info.side_effect = ValueError("Image pullspec is not found.")
quay_auth_file = str(Path(self.enterContext(tempfile.TemporaryDirectory())) / "quay-auth.json")

Expand Down
Loading