Skip to content

Commit

Permalink
followups
Browse files Browse the repository at this point in the history
  • Loading branch information
thegreyd committed Nov 7, 2024
1 parent 3753f44 commit bb8fc91
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 7 deletions.
6 changes: 3 additions & 3 deletions doozer/doozerlib/backend/konflux_image_builder.py
Original file line number Diff line number Diff line change
Expand Up @@ -57,9 +57,9 @@ class KonfluxImageBuilder:
SUPPORTED_ARCHES = {
# Only x86_64 is supported, until we are on the new cluster
"x86_64": "linux/x86_64",
"s390x": "linux/s390x",
"ppc64le": "linux/ppc64le",
"aarch64": "linux/arm64",
# "s390x": "linux/s390x",
# "ppc64le": "linux/ppc64le",
# "aarch64": "linux/arm64",
}

def __init__(self, config: KonfluxImageBuilderConfig, logger: Optional[logging.Logger] = None) -> None:
Expand Down
1 change: 1 addition & 0 deletions doozer/doozerlib/cli/config_plashet.py
Original file line number Diff line number Diff line change
Expand Up @@ -490,6 +490,7 @@ def from_tags(config: SimpleNamespace, brew_tag: Tuple[Tuple[str, str], ...], em
runtime: Runtime = config.runtime
runtime.initialize(mode="rpms", clone_source=False, clone_distgits=False, prevent_cloning=True,
# we load disabled to include microshift rpm which still could be pinned for assembly
# and eligible for plashet inclusion
disabled=True)
assembly = runtime.assembly
koji_proxy = runtime.build_retrying_koji_client()
Expand Down
6 changes: 2 additions & 4 deletions pyartcd/pyartcd/pipelines/build_microshift_bootc.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
import os
import requests
import asyncio
from datetime import datetime, timezone
from typing import Optional

from artcommonlib.assembly import AssemblyTypes
Expand All @@ -14,7 +13,7 @@
from artcommonlib import exectools
from ruamel.yaml import YAML

from pyartcd import constants, oc, util
from pyartcd import constants, oc
from pyartcd.runtime import Runtime
from pyartcd.util import (get_assembly_type,
isolate_el_version_in_release,
Expand Down Expand Up @@ -225,9 +224,8 @@ async def _rebase_and_build_bootc(self):
await self._build_plashet_for_bootc()

# Rebase and build bootc image
timestamp = datetime.now(tz=timezone.utc).strftime("%Y%m%d%H%M")
version = f"v{major}.{minor}.0"
release = f"{timestamp}.p?"
release = default_release_suffix()
rebase_cmd = [
"doozer",
"--group", self.group,
Expand Down

0 comments on commit bb8fc91

Please sign in to comment.